X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/7cd900d61edbd6d322db3cecb913adf574389320..117c2040b807dfd3cc578e8b5ba07ce504b102fe:/cmd/mobius-hotline-server/main.go?ds=sidebyside

diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go
index bf41da1..1390dda 100644
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -3,172 +3,195 @@ package main
 import (
 	"context"
 	"embed"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"github.com/jhalter/mobius/hotline"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
+	"github.com/jhalter/mobius/internal/mobius"
+	"github.com/oleksandr/bonjour"
 	"io"
 	"log"
-	"math/rand"
-	"net/http"
 	"os"
-	"runtime"
-	"strings"
-	"time"
+	"os/signal"
+	"path"
+	"path/filepath"
+	"syscall"
 )
 
 //go:embed mobius/config
 var cfgTemplate embed.FS
 
-const (
-	defaultPort = 5500
+// Values swapped in by go-releaser at build time
+var (
+	version = "dev"
+	commit  = "none"
+	date    = "unknown"
 )
 
 func main() {
-	rand.Seed(time.Now().UnixNano())
-
 	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():
-	// 	}
-	// }()
-
-	basePort := flag.Int("bind", defaultPort, "Bind address and port")
-	statsPort := flag.String("stats-port", "", "Enable stats HTTP endpoint on address and port")
-	configDir := flag.String("config", defaultConfigPath(), "Path to config root")
-	version := flag.Bool("version", false, "print version and exit")
+	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", 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 *version {
-		fmt.Printf("v%s\n", hotline.VERSION)
+	if *printVersion {
+		fmt.Printf("mobius-hotline-server %s, commit %s, built on %s\n", version, commit, date)
 		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)
-	}
-
-	cores := []zapcore.Core{newStdoutCore(zapLvl)}
-	l := zap.New(zapcore.NewTee(cores...))
-	defer func() { _ = l.Sync() }()
-	logger := l.Sugar()
-
-	if !(strings.HasSuffix(*configDir, "/") || strings.HasSuffix(*configDir, "\\")) {
-		*configDir = *configDir + "/"
-	}
+	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
 	if *init {
-		if _, err := os.Stat(*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 {
-				logger.Fatal(err)
+				slogger.Error(fmt.Sprintf("error creating config dir: %s", err))
+				os.Exit(1)
 			}
-
-			if err := copyDir("mobius/config", *configDir); err != nil {
-				logger.Fatal(err)
+			if err := copyDir(path.Join("mobius", "config"), *configDir); err != nil {
+				slogger.Error(fmt.Sprintf("error copying config dir: %s", err))
+				os.Exit(1)
 			}
-			logger.Infow("Config dir initialized at " + *configDir)
-
+			slogger.Info("Config dir initialized at " + *configDir)
 		} else {
-			logger.Infow("Existing config dir found.  Skipping initialization.")
+			slogger.Info("Existing config dir found.  Skipping initialization.")
 		}
 	}
 
-	if _, err := os.Stat(*configDir); os.IsNotExist(err) {
-		logger.Fatalw("Configuration directory not found", "path", configDir)
+	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, *basePort, logger, &hotline.OSFileStore{})
+	srv, err := hotline.NewServer(
+		hotline.WithInterface(*netInterface),
+		hotline.WithLogger(slogger),
+		hotline.WithPort(*basePort),
+		hotline.WithConfig(*config),
+	)
 	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)
+	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)
 	}
 
-	// Serve Hotline requests until program exit
-	logger.Fatal(srv.ListenAndServe(ctx, cancel))
-}
+	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)
+	}
 
-type statHandler struct {
-	hlServer *hotline.Server
-}
+	srv.AccountManager, err = mobius.NewYAMLAccountManager(filepath.Join(*configDir, "Users/"))
+	if err != nil {
+		slogger.Error(fmt.Sprintf("Error loading accounts: %v", err))
+		os.Exit(1)
+	}
 
-func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) {
-	u, err := json.Marshal(sh.hlServer.Stats)
+	srv.Agreement, err = mobius.NewAgreement(*configDir, "\r")
 	if err != nil {
-		panic(err)
+		slogger.Error(fmt.Sprintf("Error loading agreement: %v", err))
+		os.Exit(1)
 	}
 
-	_, _ = io.WriteString(w, string(u))
-}
+	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)
+	}
 
-func newStdoutCore(level zapcore.Level) zapcore.Core {
-	encoderCfg := zap.NewProductionEncoderConfig()
-	encoderCfg.TimeKey = "timestamp"
-	encoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder
+	reloadFunc := func() {
+		if err := srv.MessageBoard.(*mobius.FlatNews).Reload(); err != nil {
+			slogger.Error("Error reloading news", "err", err)
+		}
 
-	return zapcore.NewCore(
-		zapcore.NewConsoleEncoder(encoderCfg),
-		zapcore.Lock(os.Stdout),
-		level,
-	)
-}
+		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)
+	}
 
-var zapLogLevel = map[string]zapcore.Level{
-	"debug": zap.DebugLevel,
-	"info":  zap.InfoLevel,
-	"warn":  zap.WarnLevel,
-	"error": zap.ErrorLevel,
+	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)
+
+	// Assign functions to handle specific Hotline transaction types
+	mobius.RegisterHandlers(srv)
+
+	if srv.Config.EnableBonjour {
+		s, err := bonjour.Register(srv.Config.Name, "_hotline._tcp", "", *basePort, []string{"txtv=1", "app=hotline"}, nil)
+		if err != nil {
+			slogger.Error("Error registering Hotline server with Bonjour", "err", err)
+		}
+		defer s.Shutdown()
+	}
+
+	// Serve Hotline requests until program exit
+	log.Fatal(srv.ListenAndServe(ctx))
 }
 
-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:
-		fmt.Printf("unsupported OS")
 	}
 
-	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 {
@@ -176,33 +199,33 @@ func copyDir(src, dst string) error {
 	}
 	for _, dirEntry := range entries {
 		if dirEntry.IsDir() {
-			if err := os.MkdirAll(dst+"/"+dirEntry.Name(), 0777); err != nil {
+			if err := os.MkdirAll(path.Join(dst, dirEntry.Name()), 0777); err != nil {
 				panic(err)
 			}
-			subdirEntries, _ := cfgTemplate.ReadDir(src + "/" + dirEntry.Name())
+			subdirEntries, _ := cfgTemplate.ReadDir(path.Join(src, dirEntry.Name()))
 			for _, subDirEntry := range subdirEntries {
-				f, err := os.Create(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(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(dst + "/" + dirEntry.Name())
+			f, err := os.Create(path.Join(dst, dirEntry.Name()))
 			if err != nil {
 				return err
 			}
 
-			srcFile, err := cfgTemplate.Open(src + "/" + dirEntry.Name())
+			srcFile, err := cfgTemplate.Open(path.Join(src, dirEntry.Name()))
 			if err != nil {
 				return err
 			}
@@ -210,9 +233,8 @@ func copyDir(src, dst string) error {
 			if err != nil {
 				return err
 			}
-			f.Close()
+			_ = f.Close()
 		}
-
 	}
 
 	return nil