Re-organize cmd paths

11 files changed, 248 insertions, 0 deletions

diff --git a/cmd/mobius-hotline-client/main.go b/cmd/mobius-hotline-client/main.go
new file mode 100644
index 0000000..ec6f895
--- /dev/null
+++ b/cmd/mobius-hotline-client/main.go
@@ -0,0 +1,114 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"github.com/jhalter/mobius/hotline"
+	"github.com/rivo/tview"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"log"
+	"os"
+	"os/signal"
+	"runtime"
+	"syscall"
+)
+
+func main() {
+	_, cancelRoot := context.WithCancel(context.Background())
+
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, syscall.SIGTERM, syscall.SIGINT, os.Interrupt)
+
+	version := flag.Bool("version", false, "print version and exit")
+	logLevel := flag.String("log-level", "info", "Log level")
+	logFile := flag.String("log-file", "", "output logs to file")
+
+	flag.Parse()
+
+	if *version {
+		fmt.Printf("v%s\n", hotline.VERSION)
+		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)
+	}
+
+	// init DebugBuffer
+	db := &hotline.DebugBuffer{
+		TextView: tview.NewTextView(),
+	}
+
+	cores := []zapcore.Core{newZapCore(zapLvl, db)}
+
+	// Add file logger if optional log-file flag was passed
+	if *logFile != "" {
+		f, err := os.OpenFile(*logFile,
+			os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		if err != nil {
+			log.Println(err)
+		}
+		defer f.Close()
+		if err != nil {
+			panic(err)
+		}
+		cores = append(cores, newZapCore(zapLvl, f))
+	}
+
+	l := zap.New(zapcore.NewTee(cores...))
+	defer func() { _ = l.Sync() }()
+	logger := l.Sugar()
+	logger.Infow("Started Mobius client", "Version", hotline.VERSION)
+
+	go func() {
+		sig := <-sigChan
+		logger.Infow("Stopping client", "signal", sig.String())
+		cancelRoot()
+	}()
+
+	cfgPath := defaultConfigPath()
+
+	client := hotline.NewClient(cfgPath, logger)
+	client.DebugBuf = db
+	client.UI.Start()
+
+}
+
+func newZapCore(level zapcore.Level, syncer zapcore.WriteSyncer) zapcore.Core {
+	encoderCfg := zap.NewProductionEncoderConfig()
+	encoderCfg.TimeKey = "timestamp"
+	encoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder
+
+	return zapcore.NewCore(
+		zapcore.NewConsoleEncoder(encoderCfg),
+		zapcore.Lock(syncer),
+		level,
+	)
+}
+
+var zapLogLevel = map[string]zapcore.Level{
+	"debug": zap.DebugLevel,
+	"info":  zap.InfoLevel,
+	"warn":  zap.WarnLevel,
+	"error": zap.ErrorLevel,
+}
+
+func defaultConfigPath() (cfgPath string) {
+	os := runtime.GOOS
+	switch os {
+	case "windows":
+		cfgPath = "mobius-client-config.yaml"
+	case "darwin":
+		cfgPath = "/usr/local/etc/mobius-client-config.yaml"
+	case "linux":
+		cfgPath = "/usr/local/etc/mobius-client-config.yaml"
+	default:
+		fmt.Printf("unsupported OS")
+	}
+
+	return cfgPath
+}
diff --git a/cmd/mobius-hotline-client/mobius-client-config.yaml b/cmd/mobius-hotline-client/mobius-client-config.yaml
new file mode 100644
index 0000000..978122b
--- /dev/null
+++ b/cmd/mobius-hotline-client/mobius-client-config.yaml
@@ -0,0 +1,8 @@
+Username: unnamed
+IconID: 414
+Tracker: hltracker.com:5498
+Bookmarks:
+  - Name: Example Server
+    Addr: localhost:5500
+    Login: guest
+    Password: ""
\ No newline at end of file
diff --git a/cmd/mobius-hotline-client/mobius-hotline-server.service b/cmd/mobius-hotline-client/mobius-hotline-server.service
new file mode 100644
index 0000000..ec2437c
--- /dev/null
+++ b/cmd/mobius-hotline-client/mobius-hotline-server.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Mobius Server
+After=network.target
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStart=/usr/local/bin/mobius-hotline-server
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go
new file mode 100644
index 0000000..772625b
--- /dev/null
+++ b/cmd/mobius-hotline-server/main.go
@@ -0,0 +1,73 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"github.com/jhalter/mobius/hotline"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"os"
+)
+
+const (
+	defaultConfigPath = "/usr/local/var/mobius/config/" // matches Homebrew default config location
+	defaultPort       = 5500
+)
+
+func main() {
+	ctx, cancelRoot := context.WithCancel(context.Background())
+
+	basePort := flag.Int("bind", defaultPort, "Bind address and port")
+	configDir := flag.String("config", defaultConfigPath, "Path to config root")
+	version := flag.Bool("version", false, "print version and exit")
+	logLevel := flag.String("log-level", "info", "Log level")
+	flag.Parse()
+
+	if *version {
+		fmt.Printf("v%s\n", hotline.VERSION)
+		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 _, err := os.Stat(*configDir); os.IsNotExist(err) {
+		logger.Fatalw("Configuration directory not found", "path", configDir)
+	}
+
+	srv, err := hotline.NewServer(*configDir, "", *basePort, logger)
+	if err != nil {
+		logger.Fatal(err)
+	}
+
+	// Serve Hotline requests until program exit
+	logger.Fatal(srv.ListenAndServe(ctx, cancelRoot))
+}
+
+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,
+	)
+}
+
+var zapLogLevel = map[string]zapcore.Level{
+	"debug": zap.DebugLevel,
+	"info":  zap.InfoLevel,
+	"warn":  zap.WarnLevel,
+	"error": zap.ErrorLevel,
+}
diff --git a/cmd/mobius-hotline-server/mobius/config/Agreement.txt b/cmd/mobius-hotline-server/mobius/config/Agreement.txt
new file mode 100644
index 0000000..5da4639
--- /dev/null
+++ b/cmd/mobius-hotline-server/mobius/config/Agreement.txt
@@ -0,0 +1 @@
+This is an agreement.  Say you agree.
diff --git a/cmd/mobius-hotline-server/mobius/config/Files/hello.txt b/cmd/mobius-hotline-server/mobius/config/Files/hello.txt
new file mode 100644
index 0000000..271a837
--- /dev/null
+++ b/cmd/mobius-hotline-server/mobius/config/Files/hello.txt
@@ -0,0 +1 @@
+I'm a test file
\ No newline at end of file
diff --git a/cmd/mobius-hotline-server/mobius/config/MessageBoard.txt b/cmd/mobius-hotline-server/mobius/config/MessageBoard.txt
new file mode 100644
index 0000000..cb36354
--- /dev/null
+++ b/cmd/mobius-hotline-server/mobius/config/MessageBoard.txt
@@ -0,0 +1 @@
+Welcome to Hotline
diff --git a/cmd/mobius-hotline-server/mobius/config/ThreadedNews.yaml b/cmd/mobius-hotline-server/mobius/config/ThreadedNews.yaml
new file mode 100644
index 0000000..59e0a68
--- /dev/null
+++ b/cmd/mobius-hotline-server/mobius/config/ThreadedNews.yaml
@@ -0,0 +1 @@
+Categories: {}
diff --git a/cmd/mobius-hotline-server/mobius/config/Users/admin.yaml b/cmd/mobius-hotline-server/mobius/config/Users/admin.yaml
new file mode 100644
index 0000000..5413735
--- /dev/null
+++ b/cmd/mobius-hotline-server/mobius/config/Users/admin.yaml
@@ -0,0 +1,12 @@
+Login: admin
+Name: admin
+Password: $2a$04$2itGEYx8C1N5bsfRSoC9JuonS3I4YfnyVPZHLSwp7kEInRX0yoB.a
+Access:
+- 255
+- 255
+- 255
+- 255
+- 255
+- 255
+- 255
+- 255
diff --git a/cmd/mobius-hotline-server/mobius/config/Users/guest.yaml b/cmd/mobius-hotline-server/mobius/config/Users/guest.yaml
new file mode 100644
index 0000000..a1e4069
--- /dev/null
+++ b/cmd/mobius-hotline-server/mobius/config/Users/guest.yaml
@@ -0,0 +1,12 @@
+Login: guest
+Name: guest
+Password: $2a$04$9P/jgLn1fR9TjSoWL.rKxuN6g.1TSpf2o6Hw.aaRuBwrWIJNwsKkS
+Access:
+- 252
+- 240
+- 205
+- 201
+- 43
+- 128
+- 0
+- 0
diff --git a/cmd/mobius-hotline-server/mobius/config/config.yaml b/cmd/mobius-hotline-server/mobius/config/config.yaml
new file mode 100644
index 0000000..5c8b202
--- /dev/null
+++ b/cmd/mobius-hotline-server/mobius/config/config.yaml
@@ -0,0 +1,12 @@
+Name: My Hotline server
+Description: A default configured Hotline server running Mobius v0.0.1
+BannerID: 0
+FileRoot: Files/
+EnableTrackerRegistration: false
+Trackers:
+- hltracker.com:5499
+NewsDelimiter: ""
+NewsDateFormat: ""
+MaxDownloads: 0
+MaxDownloadsPerClient: 0
+MaxConnectionsPerIP: 0