multi source

Client/WebUI/main.go

@@ -2,11 +2,13 @@ package main
 
 import (
 	"embed"
+	"errors"
 	"flag"
 	"fmt"
 	"io/fs"
 	"log"
 	"net/http"
+	"os"
 )
 
 // version is set at build time via -ldflags "-X main.version=..."
@@ -15,19 +17,36 @@ var version = "dev"
 //go:embed static
 var staticFiles embed.FS
 
+// multiFlag allows a flag to be repeated: --source a --source b
+type multiFlag []string
+
+func (f *multiFlag) String() string  { return fmt.Sprintf("%v", []string(*f)) }
+func (f *multiFlag) Set(v string) error { *f = append(*f, v); return nil }
+
 func main() {
-	streamerAddr := flag.String("streamer", "127.0.0.1:44500", "MARTe2 UDP streamer address (host:port)")
+	var sourceArgs multiFlag
+	flag.Var(&sourceArgs, "source", `Data source in the form [label@]host:port (repeatable)`)
+	sourcesFile := flag.String("sources-file", "", "JSON file for persistent source list (load on start, save target)")
 	listenAddr := flag.String("listen", ":8080", "HTTP listen address")
-	clientPort := flag.Int("clientport", 44900, "Local UDP port to bind for streamer data")
 	flag.Parse()
 
 	hub := NewHub()
+	sm := NewSourceManager(hub, *sourcesFile)
+	hub.sm = sm
+
 	go hub.Run()
 
-	udpClient := NewUDPClient(*streamerAddr, *clientPort, hub)
-	go udpClient.Run()
+	// Load sources from file first (if specified), then add any CLI --source flags.
+	if *sourcesFile != "" {
+		if err := sm.Load(*sourcesFile); err != nil && !errors.Is(err, os.ErrNotExist) {
+			log.Printf("sources-file load: %v", err)
+		}
+	}
+	for _, arg := range sourceArgs {
+		label, addr := ParseSourceArg(arg)
+		sm.Add(label, addr)
+	}
 
-	// Serve the embedded static/ directory (index.html, style.css, app.js).
 	sub, err := fs.Sub(staticFiles, "static")
 	if err != nil {
 		log.Fatalf("static sub-fs: %v", err)
@@ -38,8 +57,7 @@ func main() {
 		fmt.Fprint(w, version)
 	})
 
-	log.Printf("WebUI listening on %s  (streamer=%s, local UDP port=%d, version=%s)",
-		*listenAddr, *streamerAddr, *clientPort, version)
+	log.Printf("WebUI listening on %s (version=%s)", *listenAddr, version)
 	if err := http.ListenAndServe(*listenAddr, nil); err != nil {
 		log.Fatalf("http: %v", err)
 	}