Refactor

internal/app/control.go

@@ -12,6 +12,10 @@ import (
 	"net/netip"
 	"time"
 
+	"github.com/nextmn/ue-lite/internal/cli"
+	"github.com/nextmn/ue-lite/internal/radio"
+	"github.com/nextmn/ue-lite/internal/session"
+
 	"github.com/nextmn/json-api/healthcheck"
 
 	"github.com/gin-gonic/gin"
@@ -20,36 +24,36 @@ import (
 
 type HttpServerEntity struct {
 	srv   *http.Server
-	ps    *PduSessions
-	radio *Radio
-	cli   *Cli
+	ps    *session.PduSessions
+	radio *radio.Radio
+	cli   *cli.Cli
 }
 
-func NewHttpServerEntity(bindAddr netip.AddrPort, radio *Radio, ps *PduSessions) *HttpServerEntity {
-	cli := NewCli(radio, ps)
+func NewHttpServerEntity(bindAddr netip.AddrPort, r *radio.Radio, ps *session.PduSessions) *HttpServerEntity {
+	c := cli.NewCli(r, ps)
 	// TODO: gin.SetMode(gin.DebugMode) / gin.SetMode(gin.ReleaseMode) depending on log level
-	r := gin.Default()
-	r.GET("/status", Status)
+	h := gin.Default()
+	h.GET("/status", Status)
 
 	// CLI
-	r.POST("/cli/radio/peer", cli.RadioPeer)
-	r.POST("/cli/ps/establish", cli.PsEstablish)
+	h.POST("/cli/radio/peer", c.RadioPeer)
+	h.POST("/cli/ps/establish", c.PsEstablish)
 
 	// Radio
-	r.POST("/radio/peer", radio.Peer)
+	h.POST("/radio/peer", r.Peer)
 
 	// Pdu Session
-	r.POST("/ps/establishment-accept", ps.EstablishmentAccept)
+	h.POST("/ps/establishment-accept", ps.EstablishmentAccept)
 
 	logrus.WithFields(logrus.Fields{"http-addr": bindAddr}).Info("HTTP Server created")
 	e := HttpServerEntity{
 		srv: &http.Server{
 			Addr:    bindAddr.String(),
-			Handler: r,
+			Handler: h,
 		},
 		ps:    ps,
-		radio: radio,
-		cli:   cli,
+		radio: r,
+		cli:   c,
 	}
 	return &e
 }

internal/app/setup.go

@@ -9,38 +9,44 @@ import (
 	"context"
 
 	"github.com/nextmn/ue-lite/internal/config"
+	"github.com/nextmn/ue-lite/internal/radio"
+	"github.com/nextmn/ue-lite/internal/session"
+	"github.com/nextmn/ue-lite/internal/tun"
 )
 
 type Setup struct {
 	config           *config.UEConfig
 	httpServerEntity *HttpServerEntity
-	radioDaemon      *RadioDaemon
-	psMan            *PduSessionsManager
-	tunMan           *TunManager
+	radioDaemon      *radio.RadioDaemon
+	ps               *session.PduSessions
+	tunMan           *tun.TunManager
 }
 
 func NewSetup(config *config.UEConfig) *Setup {
-	radio := NewRadio(config.Control.Uri, config.Ran.BindAddr, "go-github-nextmn-ue-lite")
-	psMan := NewPduSessionsManager(radio)
-	ps := NewPduSessions(config.Control.Uri, psMan, "go-github-nextmn-ue-lite")
+	r := radio.NewRadio(config.Control.Uri, config.Ran.BindAddr, "go-github-nextmn-ue-lite")
+	tunMan := tun.NewTunManager()
+	psMan := session.NewPduSessionsManager(tunMan)
+	ps := session.NewPduSessions(config.Control.Uri, psMan, config.Ran.PDUSessions, "go-github-nextmn-ue-lite")
 	return &Setup{
 		config:           config,
-		httpServerEntity: NewHttpServerEntity(config.Control.BindAddr, radio, ps),
-		radioDaemon:      NewRadioDaemon(config.Control.Uri, config.Ran.Gnbs, config.Ran.PDUSessions, radio, ps, psMan, config.Ran.BindAddr),
-		psMan:            psMan,
-		tunMan:           NewTunManager(),
+		httpServerEntity: NewHttpServerEntity(config.Control.BindAddr, r, ps),
+		radioDaemon:      radio.NewRadioDaemon(config.Control.Uri, config.Ran.Gnbs, r, psMan, tunMan, config.Ran.BindAddr),
+		ps:               ps,
+		tunMan:           tunMan,
 	}
 }
 
 func (s *Setup) Init(ctx context.Context) error {
 	if err := s.httpServerEntity.Start(); err != nil {
 		return err
 	}
-	tun, err := s.tunMan.Start(ctx)
-	if err != nil {
+	if err := s.tunMan.Start(ctx); err != nil {
 		return err
 	}
-	if err := s.radioDaemon.Start(ctx, tun); err != nil {
+	if err := s.radioDaemon.Start(ctx); err != nil {
+		return err
+	}
+	if err := s.ps.Start(ctx); err != nil {
 		return err
 	}
 	return nil

internal/app/cli.go → internal/cli/cli.go

@@ -3,23 +3,26 @@
 // found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
-package app
+package cli
 
 import (
 	"net/http"
 
 	"github.com/nextmn/json-api/jsonapi"
 
+	"github.com/nextmn/ue-lite/internal/radio"
+	"github.com/nextmn/ue-lite/internal/session"
+
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
 
 type Cli struct {
-	Radio       *Radio
-	PduSessions *PduSessions
+	Radio       *radio.Radio
+	PduSessions *session.PduSessions
 }
 
-func NewCli(radio *Radio, pduSessions *PduSessions) *Cli {
+func NewCli(radio *radio.Radio, pduSessions *session.PduSessions) *Cli {
 	return &Cli{
 		Radio:       radio,
 		PduSessions: pduSessions,

internal/app/radio.go → internal/radio/radio.go

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
-package app
+package radio
 
 import (
 	"bytes"