Update docker image name

[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 f18ae9d9c841a9edb70062b9ec96c017f8d8e8ba..1e9b5b6fd55f77eb1758f888cf84af7492923523 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -2,86 +2,157 @@ package main
 
 import (
        "context"
 
 import (
        "context"

+       "embed"
+       "encoding/json"

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

-       "go.uber.org/zap"
-       "go.uber.org/zap/zapcore"
-       "math/rand"
+       "gopkg.in/natefinch/lumberjack.v2"
+       "io"
+       "log"
+       "log/slog"
+       "net/http"

        "os"
        "os"

+       "path"

        "runtime"
        "runtime"

-       "time"

 )
 
 )
 

-const (
-       defaultPort = 5500
-)
+//go:embed mobius/config
+var cfgTemplate embed.FS

 
 

-func main() {
-       rand.Seed(time.Now().UnixNano())
+const defaultPort = 5500

 
 

-       ctx, cancelRoot := context.WithCancel(context.Background())
+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"
+       date    = "unknown"
+)

 
 

-       basePort := flag.Int("bind", defaultPort, "Bind address and port")
+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():
+       //      }
+       //}()
+
+       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")
        configDir := flag.String("config", defaultConfigPath(), "Path to config root")

-       version := flag.Bool("version", false, "print version and exit")
+       printVersion := flag.Bool("version", false, "print version and exit")

        logLevel := flag.String("log-level", "info", "Log level")
        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()
 
        flag.Parse()
 

-       if *version {
-               fmt.Printf("v%s\n", hotline.VERSION)
+       if *printVersion {
+               fmt.Printf("mobius-hotline-server %s, commit %s, built at %s", version, commit, date)

                os.Exit(0)
        }
 
                os.Exit(0)
        }
 

-       zapLvl, ok := zapLogLevel[*logLevel]
-       if !ok {
-               fmt.Printf("Invalid log level %s.  Must be debug, info, warn, or error.\n", *logLevel)
-               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]},
+               ),
+       )

 
 

-       cores := []zapcore.Core{newStdoutCore(zapLvl)}
-       l := zap.New(zapcore.NewTee(cores...))
-       defer func() { _ = l.Sync() }()
-       logger := l.Sugar()
+       // 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(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(path.Join("mobius", "config"), *configDir); err != nil {
+                               slogger.Error(fmt.Sprintf("error copying config dir: %s", err))
+                               os.Exit(1)
+                       }
+                       slogger.Info("Config dir initialized at " + *configDir)
+               } else {
+                       slogger.Info("Existing config dir found.  Skipping initialization.")
+               }
+       }

 
        if _, err := os.Stat(*configDir); os.IsNotExist(err) {
 
        if _, err := os.Stat(*configDir); os.IsNotExist(err) {

-               logger.Fatalw("Configuration directory not found", "path", configDir)
+               slogger.Error("Configuration directory not found.  Correct the path or re-run with -init to generate initial config.")
+               os.Exit(1)

        }
 
        }
 

-       hotline.FS = &hotline.OSFileStore{}
-
-       srv, err := hotline.NewServer(*configDir, "", *basePort, logger)
+       srv, err := hotline.NewServer(*configDir, *netInterface, *basePort, slogger, &hotline.OSFileStore{})

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

-               logger.Fatal(err)
+               slogger.Error(fmt.Sprintf("Error starting server: %s", err))
+               os.Exit(1)
+       }
+
+       sh := statHandler{hlServer: srv}
+       if *statsPort != "" {
+               http.HandleFunc("/", sh.RenderStats)
+
+               go func(srv *hotline.Server) {
+                       // Use the default DefaultServeMux.
+                       err = http.ListenAndServe(":"+*statsPort, nil)
+                       if err != nil {
+                               log.Fatal(err)
+                       }
+               }(srv)

        }
 
        }
 

+       slogger.Info("Hotline server started",
+               "version", version,
+               "API port", fmt.Sprintf("%s:%v", *netInterface, *basePort),
+               "Transfer port", fmt.Sprintf("%s:%v", *netInterface, *basePort+1),
+       )
+

        // Serve Hotline requests until program exit
        // Serve Hotline requests until program exit

-       logger.Fatal(srv.ListenAndServe(ctx, cancelRoot))
+       log.Fatal(srv.ListenAndServe(ctx))

 }
 
 }
 

-func newStdoutCore(level zapcore.Level) zapcore.Core {
-       encoderCfg := zap.NewProductionEncoderConfig()
-       encoderCfg.TimeKey = "timestamp"
-       encoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder
-
-       return zapcore.NewCore(
-               zapcore.NewConsoleEncoder(encoderCfg),
-               zapcore.Lock(os.Stdout),
-               level,
-       )
+type statHandler struct {
+       hlServer *hotline.Server

 }
 
 }
 

-var zapLogLevel = map[string]zapcore.Level{
-       "debug": zap.DebugLevel,
-       "info":  zap.InfoLevel,
-       "warn":  zap.WarnLevel,
-       "error": zap.ErrorLevel,
+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() (cfgPath string) {
+func defaultConfigPath() string {
+       var cfgPath string
+

        switch runtime.GOOS {
        case "windows":
        switch runtime.GOOS {
        case "windows":

-               cfgPath = "config"
+               cfgPath = "config/"

        case "darwin":
                if _, err := os.Stat("/usr/local/var/mobius/config/"); err == nil {
                        cfgPath = "/usr/local/var/mobius/config/"
        case "darwin":
                if _, err := os.Stat("/usr/local/var/mobius/config/"); err == nil {
                        cfgPath = "/usr/local/var/mobius/config/"


@@ -91,8 +162,75 @@ func defaultConfigPath() (cfgPath string) {
        case "linux":
                cfgPath = "/usr/local/var/mobius/config/"
        default:
        case "linux":
                cfgPath = "/usr/local/var/mobius/config/"
        default:

-               fmt.Printf("unsupported OS")
+               cfgPath = "./config/"

        }
 
        return cfgPath
 }
        }
 
        return cfgPath
 }

+
+// 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
+       }
+       defer sourceFile.Close()
+
+       destinationFile, err := os.Create(dst)
+       if err != nil {
+               return err
+       }
+       defer destinationFile.Close()
+
+       _, err = io.Copy(destinationFile, sourceFile)
+       return err
+}
+
+// copyDir recursively copies a directory tree, attempting to preserve permissions.
+func copyDir(src, dst string) error {
+       entries, err := cfgTemplate.ReadDir(src)
+       if err != nil {
+               return err
+       }
+       for _, dirEntry := range entries {
+               if dirEntry.IsDir() {
+                       if err := os.MkdirAll(path.Join(dst, dirEntry.Name()), 0777); err != nil {
+                               panic(err)
+                       }
+                       subdirEntries, _ := cfgTemplate.ReadDir(path.Join(src, dirEntry.Name()))
+                       for _, subDirEntry := range subdirEntries {
+                               f, err := os.Create(path.Join(dst, dirEntry.Name(), subDirEntry.Name()))
+                               if err != nil {
+                                       return err
+                               }
+
+                               srcFile, err := cfgTemplate.Open(path.Join(src, dirEntry.Name(), subDirEntry.Name()))
+                               if err != nil {
+                                       return fmt.Errorf("error copying srcFile: %w", err)
+                               }
+                               _, err = io.Copy(f, srcFile)
+                               if err != nil {
+                                       return err
+                               }
+                               f.Close()
+                       }
+               } else {
+                       f, err := os.Create(path.Join(dst, dirEntry.Name()))
+                       if err != nil {
+                               return err
+                       }
+
+                       srcFile, err := cfgTemplate.Open(path.Join(src, dirEntry.Name()))
+                       if err != nil {
+                               return err
+                       }
+                       _, err = io.Copy(f, srcFile)
+                       if err != nil {
+                               return err
+                       }
+                       f.Close()
+               }
+       }
+
+       return nil
+}