From e852afcf2a58807a522895e8c06c30f22d3f944b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Sat, 31 Oct 2020 16:40:33 +0100
Subject: [PATCH] start file refactor.

---
 cmd/root.go  |  4 +--
 cmd/serve.go | 10 +++----
 neko.go      | 85 +++++++++++++++++++++++++++++++---------------------
 3 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/cmd/root.go b/cmd/root.go
index 78af80df..172cd652 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -117,10 +117,10 @@ func init() {
 			logger.Info().Msg("preflight complete")
 		}
 
-		neko.Service.Root.Set()
+		neko.Service.Configs.Root.Set()
 	})
 
-	if err := neko.Service.Root.Init(root); err != nil {
+	if err := neko.Service.Configs.Root.Init(root); err != nil {
 		log.Panic().Err(err).Msg("unable to run root command")
 	}
 
diff --git a/cmd/serve.go b/cmd/serve.go
index 520080c8..f1729c41 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -17,11 +17,11 @@ func init() {
 	}
 
 	configs := []config.Config{
-		neko.Service.Server,
-		neko.Service.WebRTC,
-		neko.Service.Remote,
-		neko.Service.Broadcast,
-		neko.Service.WebSocket,
+		neko.Service.Configs.Server,
+		neko.Service.Configs.WebRTC,
+		neko.Service.Configs.Remote,
+		neko.Service.Configs.Broadcast,
+		neko.Service.Configs.WebSocket,
 	}
 
 	cobra.OnInitialize(func() {
diff --git a/neko.go b/neko.go
index 6c631dee..62ef3fe0 100644
--- a/neko.go
+++ b/neko.go
@@ -59,12 +59,14 @@ func init() {
 			Compiler:  runtime.Compiler,
 			Platform:  fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
 		},
-		Root:      &config.Root{},
-		Server:    &config.Server{},
-		Remote:    &config.Remote{},
-		Broadcast: &config.Broadcast{},
-		WebRTC:    &config.WebRTC{},
-		WebSocket: &config.WebSocket{},
+		Configs: &Configs{
+			Root:      &config.Root{},
+			Server:    &config.Server{},
+			Remote:    &config.Remote{},
+			Broadcast: &config.Broadcast{},
+			WebRTC:    &config.WebRTC{},
+			WebSocket: &config.WebSocket{},
+		},
 	}
 }
 
@@ -97,14 +99,18 @@ func (i *Version) Details() string {
 	)
 }
 
-type Neko struct {
-	Version   *Version
+type Configs struct {
 	Root      *config.Root
 	Remote    *config.Remote
 	Broadcast *config.Broadcast
 	Server    *config.Server
 	WebRTC    *config.WebRTC
 	WebSocket *config.WebSocket
+}
+
+type Neko struct {
+	Version   *Version
+	Configs   *Configs
 
 	logger           zerolog.Logger
 	server           *http.Server
@@ -120,34 +126,45 @@ func (neko *Neko) Preflight() {
 }
 
 func (neko *Neko) Start() {
-	broadcastManager := broadcast.New(neko.Remote, neko.Broadcast)
-
-	remoteManager := remote.New(neko.Remote, broadcastManager)
-	remoteManager.Start()
-
-	sessionManager := session.New(remoteManager)
-
-	webRTCManager := webrtc.New(sessionManager, remoteManager, neko.WebRTC)
-	webRTCManager.Start()
-
-	webSocketHandler := websocket.New(sessionManager, remoteManager, broadcastManager, webRTCManager, neko.WebSocket)
-	webSocketHandler.Start()
-
-	server := http.New(
-		sessionManager,
-		remoteManager,
-		broadcastManager,
-		webSocketHandler,
-		neko.Server,
+	neko.broadcastManager = broadcast.New(
+		neko.Configs.Remote,
+		neko.Configs.Broadcast,
 	)
-	server.Start()
 
-	neko.sessionManager = sessionManager
-	neko.remoteManager = remoteManager
-	neko.broadcastManager = broadcastManager
-	neko.webRTCManager = webRTCManager
-	neko.webSocketHandler = webSocketHandler
-	neko.server = server
+	neko.remoteManager = remote.New(
+		neko.Configs.Remote,
+		neko.broadcastManager,
+	)
+	neko.remoteManager.Start()
+
+	neko.sessionManager = session.New(
+		neko.remoteManager,
+	)
+
+	neko.webRTCManager = webrtc.New(
+		neko.sessionManager,
+		neko.remoteManager,
+		neko.Configs.WebRTC,
+	)
+	neko.webRTCManager.Start()
+
+	neko.webSocketHandler = websocket.New(
+		neko.sessionManager,
+		neko.remoteManager,
+		neko.broadcastManager,
+		neko.webRTCManager,
+		neko.Configs.WebSocket,
+	)
+	neko.webSocketHandler.Start()
+
+	neko.server = http.New(
+		neko.sessionManager,
+		neko.remoteManager,
+		neko.broadcastManager,
+		neko.webSocketHandler,
+		neko.Configs.Server,
+	)
+	neko.server.Start()
 }
 
 func (neko *Neko) Shutdown() {