Fix failing test, replace use of reflect package with assert

[rbdr/mobius] / cmd / mobius-hotline-server / main.go

diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go
index bf64848b7bd40b95b5bce16d04cbcf5a32947eb2..33ba7c2125155d511b507d1a34aa86674310db79 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -3,25 +3,24 @@ package main
 import (
        "context"
        "embed"
 import (
        "context"
        "embed"

-       "encoding/json"

        "flag"
        "fmt"
        "github.com/jhalter/mobius/hotline"
        "flag"
        "fmt"
        "github.com/jhalter/mobius/hotline"

+       "github.com/jhalter/mobius/internal/mobius"

        "gopkg.in/natefinch/lumberjack.v2"
        "io"
        "log"
        "log/slog"
        "gopkg.in/natefinch/lumberjack.v2"
        "io"
        "log"
        "log/slog"

-       "net/http"

        "os"
        "os"

+       "os/signal"
+       "path"

        "path/filepath"
        "path/filepath"

-       "runtime"
+       "syscall"

 )
 
 //go:embed mobius/config
 var cfgTemplate embed.FS
 
 )
 
 //go:embed mobius/config
 var cfgTemplate embed.FS
 

-const defaultPort = 5500
-

 var logLevels = map[string]slog.Level{
        "debug": slog.LevelDebug,
        "info":  slog.LevelInfo,
 var logLevels = map[string]slog.Level{
        "debug": slog.LevelDebug,
        "info":  slog.LevelInfo,


@@ -36,31 +35,18 @@ var (
 )
 
 func main() {
 )
 
 func main() {

-       ctx, _ := 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():
-       //      }
-       //}()
+       ctx, cancel := context.WithCancel(context.Background())
+
+       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.")
 
        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")
-       printVersion := flag.Bool("version", false, "print version and exit")
+       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")
        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()
        init := flag.Bool("init", false, "Populate the config dir with default configuration")
 
        flag.Parse()


@@ -82,14 +68,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 *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 := 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)
                        }
                                slogger.Error(fmt.Sprintf("error copying config dir: %s", err))
                                os.Exit(1)
                        }


@@ -99,90 +86,123 @@ 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.")
+       config, err := mobius.LoadConfig(path.Join(*configDir, "config.yaml"))
+       if err != nil {
+               slogger.Error(fmt.Sprintf("Error loading config: %v", err))

                os.Exit(1)
        }
 
                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)
        }
 
        if err != nil {
                slogger.Error(fmt.Sprintf("Error starting server: %s", err))
                os.Exit(1)
        }
 

-       sh := statHandler{hlServer: srv}
-       if *statsPort != "" {
-               http.HandleFunc("/", sh.RenderStats)
+       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)
+       }

 
 

-               go func(srv *hotline.Server) {
-                       // Use the default DefaultServeMux.
-                       err = http.ListenAndServe(":"+*statsPort, nil)
-                       if err != nil {
-                               log.Fatal(err)
-                       }
-               }(srv)
+       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)

        }
 
        }
 

-       slogger.Info("Hotline server started",
-               "version", version,
-               "API port", fmt.Sprintf("%s:%v", *netInterface, *basePort),
-               "Transfer port", fmt.Sprintf("%s:%v", *netInterface, *basePort+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)
+       }

 
 

-       // Serve Hotline requests until program exit
-       log.Fatal(srv.ListenAndServe(ctx))
-}
+       srv.AccountManager, err = mobius.NewYAMLAccountManager(filepath.Join(*configDir, "Users/"))
+       if err != nil {
+               slogger.Error(fmt.Sprintf("Error loading accounts: %v", err))
+               os.Exit(1)
+       }

 
 

-type statHandler struct {
-       hlServer *hotline.Server
-}
+       srv.Agreement, err = mobius.NewAgreement(*configDir, "\r")
+       if err != nil {
+               slogger.Error(fmt.Sprintf("Error loading agreement: %v", err))
+               os.Exit(1)
+       }

 
 

-func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) {
-       u, err := json.Marshal(sh.hlServer.CurrentStats())
+       bannerPath := filepath.Join(*configDir, config.BannerFile)
+       srv.Banner, err = os.ReadFile(bannerPath)

        if err != nil {
        if err != nil {

-               panic(err)
+               slogger.Error(fmt.Sprintf("Error loading accounts: %v", err))
+               os.Exit(1)

        }
 
        }
 

-       _, _ = io.WriteString(w, string(u))
-}
+       reloadFunc := func() {
+               if err := srv.MessageBoard.(*mobius.FlatNews).Reload(); err != nil {
+                       slogger.Error("Error reloading news", "err", err)
+               }

 
 

-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/"
+               if err := srv.BanList.(*mobius.BanFile).Load(); err != nil {
+                       slogger.Error("Error reloading ban list", "err", err)

                }
                }

-       case "linux":
-               cfgPath = "/usr/local/var/mobius/config/"
-       default:
-               cfgPath = "./config/"
-       }

 
 

-       return cfgPath
-}
+               if err := srv.ThreadedNewsMgr.(*mobius.ThreadedNewsYAML).Load(); err != nil {
+                       slogger.Error("Error reloading threaded news list", "err", err)
+               }

 
 

-// copyFile copies a file from src to dst. If dst does not exist, it is created.
-func copyFile(src, dst string) error {
-       sourceFile, err := os.Open(src)
-       if err != nil {
-               return err
+               if err := srv.Agreement.(*mobius.Agreement).Reload(); err != nil {
+                       slogger.Error(fmt.Sprintf("Error reloading agreement: %v", err))
+                       os.Exit(1)
+               }

        }
        }

-       defer sourceFile.Close()

 
 

-       destinationFile, err := os.Create(dst)
-       if err != nil {
-               return err
+       if *apiAddr != "" {
+               sh := mobius.NewAPIServer(srv, reloadFunc, slogger)
+               go sh.Serve(*apiAddr)
+       }
+
+       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))
+}
+
+func configSearchPaths() string {
+       for _, cfgPath := range mobius.ConfigSearchOrder {
+               if _, err := os.Stat(cfgPath); err == nil {
+                       return cfgPath
+               }

        }
        }

-       defer destinationFile.Close()

 
 

-       _, err = io.Copy(destinationFile, sourceFile)
-       return err
+       return "config"

 }
 
 // copyDir recursively copies a directory tree, attempting to preserve permissions.
 }
 
 // copyDir recursively copies a directory tree, attempting to preserve permissions.


@@ -193,33 +213,33 @@ func copyDir(src, dst string) error {
        }
        for _, dirEntry := range entries {
                if dirEntry.IsDir() {
        }
        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)
                        }
                                panic(err)
                        }

-                       subdirEntries, _ := cfgTemplate.ReadDir(filepath.Join(src, dirEntry.Name()))
+                       subdirEntries, _ := cfgTemplate.ReadDir(path.Join(src, dirEntry.Name()))

                        for _, subDirEntry := range subdirEntries {
                        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
                                }
 
                                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 {
                                if err != nil {

-                                       return err
+                                       return fmt.Errorf("error copying srcFile: %w", err)

                                }
                                _, err = io.Copy(f, srcFile)
                                if err != nil {
                                        return err
                                }
                                }
                                _, err = io.Copy(f, srcFile)
                                if err != nil {
                                        return err
                                }

-                               f.Close()
+                               _ = f.Close()

                        }
                } else {
                        }
                } else {

-                       f, err := os.Create(filepath.Join(dst, dirEntry.Name()))
+                       f, err := os.Create(path.Join(dst, dirEntry.Name()))

                        if err != nil {
                                return err
                        }
 
                        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
                        }
                        if err != nil {
                                return err
                        }


@@ -227,7 +247,7 @@ func copyDir(src, dst string) error {
                        if err != nil {
                                return err
                        }
                        if err != nil {
                                return err
                        }

-                       f.Close()
+                       _ = f.Close()

                }
        }
 
                }
        }