Merge pull request #31 from GyeongHoKim/feature/embedded-rtsp

Feature/embedded rtsp

Author: GyeongHoKim

cmd/cli/control_test.go

@@ -16,23 +16,28 @@ import (
 	"github.com/GyeongHoKim/onvif-simulator/internal/simulator"
 )
 
-// chdirToTempConfig writes a minimal valid config into a temp dir and chdirs
-// there so simulator.New can find it.
-func chdirToTempConfig(t *testing.T) (cleanup func()) {
+// writeTempConfig writes a minimal valid config into a temp dir and returns
+// its absolute path. Callers pass the path to simulator.Options.ConfigPath
+// (the explicit override path is the public way for tests to point the
+// simulator at a fixture; chdir is no longer relied on).
+func writeTempConfig(t *testing.T) (cfgPath string, cleanup func()) {
 	t.Helper()
 	dir := t.TempDir()
 	cfg := config.Config{
-		Version: 1,
+		Version: config.CurrentVersion,
 		Device: config.DeviceConfig{
 			UUID:         "urn:uuid:00000000-0000-4000-8000-000000000001",
 			Manufacturer: "Test", Model: "SimCam", Serial: "SN-1",
 			Scopes: []string{"onvif://www.onvif.org/name/test"},
 		},
-		Network: config.NetworkConfig{HTTPPort: 18081},
+		Network: config.NetworkConfig{HTTPPort: 18081, RTSPPort: 0},
 		Media: config.MediaConfig{Profiles: []config.ProfileConfig{{
 			Name: "main", Token: "profile_main",
-			RTSP:     "rtsp://127.0.0.1:8554/main",
-			Encoding: "H264", Width: 1920, Height: 1080, FPS: 30,
+			// RTSP retained as a passthrough fallback so this fixture covers
+			// the back-compat path; a fixture variant with MediaFilePath is
+			// exercised by the rtsp_test.go integration cases.
+			MediaFilePath: "",
+			Encoding:      "H264", Width: 1920, Height: 1080, FPS: 30,
 		}}},
 		Events: config.EventsConfig{
 			Topics: []config.TopicConfig{
@@ -48,24 +53,18 @@ func chdirToTempConfig(t *testing.T) (cleanup func()) {
 	if err != nil {
 		t.Fatalf("marshal: %v", err)
 	}
-	if writeErr := os.WriteFile(filepath.Join(dir, config.FileName), data, 0o600); writeErr != nil {
+	cfgPath = filepath.Join(dir, config.FileName)
+	if writeErr := os.WriteFile(cfgPath, data, 0o600); writeErr != nil {
 		t.Fatalf("write: %v", writeErr)
 	}
-	prev, getErr := os.Getwd()
-	if getErr != nil {
-		t.Fatalf("getwd: %v", getErr)
-	}
-	if chErr := os.Chdir(dir); chErr != nil {
-		t.Fatalf("chdir: %v", chErr)
-	}
-	return func() { _ = os.Chdir(prev) } //nolint:errcheck // best-effort restore.
+	return cfgPath, func() { config.SetPath("") }
 }
 
 func TestControlServerEventsAndShutdown(t *testing.T) {
-	cleanup := chdirToTempConfig(t)
+	cfgPath, cleanup := writeTempConfig(t)
 	defer cleanup()
 
-	sim, err := simulator.New(simulator.Options{EventBufferSize: 16})
+	sim, err := simulator.New(simulator.Options{EventBufferSize: 16, ConfigPath: cfgPath})
 	if err != nil {
 		t.Fatalf("simulator.New: %v", err)
 	}
@@ -118,10 +117,10 @@ func TestControlServerEventsAndShutdown(t *testing.T) {
 }
 
 func TestControlServerRejectsGET(t *testing.T) {
-	cleanup := chdirToTempConfig(t)
+	cfgPath, cleanup := writeTempConfig(t)
 	defer cleanup()
 
-	sim, err := simulator.New(simulator.Options{})
+	sim, err := simulator.New(simulator.Options{ConfigPath: cfgPath})
 	if err != nil {
 		t.Fatalf("simulator.New: %v", err)
 	}
@@ -151,10 +150,10 @@ func TestControlServerRejectsGET(t *testing.T) {
 }
 
 func TestControlServerRejectsBadJSON(t *testing.T) {
-	cleanup := chdirToTempConfig(t)
+	cfgPath, cleanup := writeTempConfig(t)
 	defer cleanup()
 
-	sim, err := simulator.New(simulator.Options{})
+	sim, err := simulator.New(simulator.Options{ConfigPath: cfgPath})
 	if err != nil {
 		t.Fatalf("simulator.New: %v", err)
 	}

cmd/cli/main.go

@@ -199,7 +199,31 @@ func runConfig(args []string) error {
 	if len(args) == 0 {
 		return errConfigSubcommandReq
 	}
-	switch args[0] {
+	sub := args[0]
+	// Reject unknown subcommands BEFORE config.EnsureExists, otherwise a
+	// typo'd subcommand would still create the user config directory and
+	// write a default file.
+	if sub != "show" && sub != "validate" {
+		return fmt.Errorf("%w: %q", errConfigUnknownSubcommand, sub)
+	}
+	fs := flag.NewFlagSet("config "+sub, flag.ContinueOnError)
+	cfgPath := fs.String("config", "", "path to onvif-simulator.json (defaults to user config dir)")
+	if err := fs.Parse(args[1:]); err != nil {
+		return err
+	}
+	resolved, err := config.Resolve(*cfgPath)
+	if err != nil {
+		return err
+	}
+	// Same ordering rationale as simulator.New: EnsureExists takes the
+	// path explicitly, so run it first and only mutate the package-level
+	// active path on success.
+	if _, err := config.EnsureExists(resolved); err != nil {
+		return err
+	}
+	config.SetPath(resolved)
+
+	switch sub {
 	case "show":
 		cfg, err := config.Load()
 		if err != nil {
@@ -214,9 +238,9 @@ func runConfig(args []string) error {
 		}
 		fmt.Println("ok")
 		return nil
-	default:
-		return fmt.Errorf("%w: %q", errConfigUnknownSubcommand, args[0])
 	}
+	// Unreachable: sub is guaranteed to be show or validate by the guard above.
+	return nil
 }
 
 // ---------- event ---------------------------------------------------------------

cmd/cli/main_test.go

@@ -88,6 +88,35 @@ func TestRunConfigUnknownSubcommand(t *testing.T) {
 	}
 }
 
+// TestRunConfigUnknownSubcommandNoSideEffects guards against the regression
+// where runConfig used to call config.EnsureExists (which mkdir's the user
+// config directory and writes a default JSON file) before validating the
+// subcommand — meaning a typo'd `onvif-simulator config bogus` would leave
+// debris in the operator's real ~/.config or ~/Library/Application Support.
+func TestRunConfigUnknownSubcommandNoSideEffects(t *testing.T) {
+	dir := t.TempDir()
+	t.Setenv("HOME", dir)            // macOS UserConfigDir base
+	t.Setenv("XDG_CONFIG_HOME", dir) // Linux UserConfigDir base
+	t.Setenv("AppData", dir)         // Windows UserConfigDir base
+	t.Cleanup(func() { config.SetPath("") })
+
+	if err := runConfig([]string{"bogus"}); !errors.Is(err, errConfigUnknownSubcommand) {
+		t.Fatalf("expected errConfigUnknownSubcommand, got %v", err)
+	}
+
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		t.Fatalf("ReadDir: %v", err)
+	}
+	if len(entries) > 0 {
+		names := make([]string, len(entries))
+		for i, e := range entries {
+			names[i] = e.Name()
+		}
+		t.Errorf("expected no filesystem side effects, found: %v", names)
+	}
+}
+
 func TestRunEventSubcommandRequired(t *testing.T) {
 	if err := runEvent(nil); !errors.Is(err, errEventSubcommandReq) {
 		t.Fatalf("expected errEventSubcommandReq, got %v", err)
@@ -107,19 +136,19 @@ func TestPostSyncEventBadArgs(t *testing.T) {
 }
 
 func TestRunConfigShow(t *testing.T) {
-	cleanup := chdirToTempConfig(t)
+	cfgPath, cleanup := writeTempConfig(t)
 	defer cleanup()
 
-	if err := runConfig([]string{"show"}); err != nil {
+	if err := runConfig([]string{"show", "-config", cfgPath}); err != nil {
 		t.Fatalf("runConfig show: %v", err)
 	}
 }
 
 func TestRunConfigValidate(t *testing.T) {
-	cleanup := chdirToTempConfig(t)
+	cfgPath, cleanup := writeTempConfig(t)
 	defer cleanup()
 
-	if err := runConfig([]string{"validate"}); err != nil {
+	if err := runConfig([]string{"validate", "-config", cfgPath}); err != nil {
 		t.Fatalf("runConfig validate: %v", err)
 	}
 }

cmd/cli/serve_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestRunServeSignalShutdown(t *testing.T) {
-	cleanup := chdirToTempConfig(t)
+	cfgPath, cleanup := writeTempConfig(t)
 	defer cleanup()
 
 	// Use a temp HOME/USERPROFILE so writeControlPortFile lands somewhere ephemeral.
@@ -20,7 +20,7 @@ func TestRunServeSignalShutdown(t *testing.T) {
 
 	done := make(chan error, 1)
 	go func() {
-		done <- runServe(nil)
+		done <- runServe([]string{"-config", cfgPath})
 	}()
 
 	// Give the server a moment to bind.
@@ -40,13 +40,13 @@ func TestRunServeSignalShutdown(t *testing.T) {
 }
 
 func TestRunTUIReturnsTUIError(t *testing.T) {
-	cleanup := chdirToTempConfig(t)
+	cfgPath, cleanup := writeTempConfig(t)
 	defer cleanup()
 	tmpHome := t.TempDir()
 	t.Setenv("HOME", tmpHome)
 	t.Setenv("USERPROFILE", tmpHome) // os.UserHomeDir uses USERPROFILE on Windows
 
-	err := runTUI(nil)
+	err := runTUI([]string{"-config", cfgPath})
 	if err == nil {
 		t.Fatal("expected error from runTUI (no TTY in tests)")
 	}

go.mod

@@ -4,17 +4,22 @@ go 1.26.2
 
 require (
 	github.com/MicahParks/keyfunc/v3 v3.8.0
+	github.com/bluenviron/gortsplib/v5 v5.5.2
+	github.com/bluenviron/mediacommon/v2 v2.8.3
 	github.com/charmbracelet/bubbles v1.0.0
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/golang-jwt/jwt/v5 v5.3.1
+	github.com/google/uuid v1.6.0
+	github.com/pion/rtp v1.10.1
 	github.com/use-go/onvif v0.0.9
 	github.com/wailsapp/wails/v2 v2.12.0
 )
 
 require (
 	git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 // indirect
 	github.com/MicahParks/jwkset v0.11.0 // indirect
+	github.com/abema/go-mp4 v1.5.0 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beevik/etree v1.1.0 // indirect
@@ -31,7 +36,6 @@ require (
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gofrs/uuid v3.2.0+incompatible // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
 	github.com/juju/errors v0.0.0-20220331221717-b38fca44723b // indirect
@@ -49,6 +53,12 @@ require (
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/pion/logging v0.2.4 // indirect
+	github.com/pion/randutil v0.1.0 // indirect
+	github.com/pion/rtcp v1.2.16 // indirect
+	github.com/pion/sdp/v3 v3.0.18 // indirect
+	github.com/pion/srtp/v3 v3.0.10 // indirect
+	github.com/pion/transport/v4 v4.0.1 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
@@ -60,9 +70,9 @@ require (
 	github.com/wailsapp/go-webview2 v1.0.22 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/crypto v0.33.0 // indirect
-	golang.org/x/net v0.35.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
+	golang.org/x/crypto v0.50.0 // indirect
+	golang.org/x/net v0.53.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/text v0.36.0 // indirect
+	golang.org/x/time v0.10.0 // indirect
 )