main.go minor changes

Author: msanlli

backend/cmd/main.go

@@ -6,7 +6,8 @@ import (
 	"encoding/binary"
 	"flag"
 	"fmt"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/adj"
+	"github.com/HyperloopUPV-H8/h9-backend/pkg/excel/utils"
+
 	"log"
 	"net"
 	"net/http"
@@ -19,11 +20,8 @@ import (
 	"strings"
 	"time"
 
+	adj_module "github.com/HyperloopUPV-H8/h9-backend/internal/adj"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/common"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/excel"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/excel/ade"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/excel/utils"
-	"github.com/HyperloopUPV-H8/h9-backend/internal/info"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/pod_data"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/update_factory"
 	vehicle_models "github.com/HyperloopUPV-H8/h9-backend/internal/vehicle/models"
@@ -58,6 +56,18 @@ import (
 	trace "github.com/rs/zerolog/log"
 )
 
+const (
+	BACKEND          = "backend"
+	BLCU             = "blcu"
+	TcpClient        = "TCP_CLIENT"
+	TcpServer        = "TCP_SERVER"
+	UDP              = "UDP"
+	SNTP             = "SNTP"
+	BlcuAck          = "blcu_ack"
+	AddStateOrder    = "add_state_order"
+	RemoveStateOrder = "remove_state_order"
+)
+
 var traceLevel = flag.String("trace", "info", "set the trace level (\"fatal\", \"error\", \"warn\", \"info\", \"debug\", \"trace\")")
 var traceFile = flag.String("log", "trace.json", "set the trace log file")
 var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
@@ -90,7 +100,7 @@ func main() {
 
 	// <--- ADJ --->
 
-	adj, err := adj.NewADJ()
+	adj, err := adj_module.NewADJ()
 	if err != nil {
 		trace.Fatal().Err(err).Msg("setting up ADJ")
 	}
@@ -116,7 +126,7 @@ func main() {
 		}
 	}
 
-	vehicleOrders, err := vehicle_models.NewVehicleOrders(podData.Boards, config.Excel.Parse.Global.BLCUAddressKey)
+	vehicleOrders, err := vehicle_models.NewVehicleOrders(podData.Boards, adj.Info.Addresses[BLCU])
 	if err != nil {
 		trace.Fatal().Err(err).Msg("creating vehicleOrders")
 	}
@@ -160,7 +170,7 @@ func main() {
 	orderTopic := order_topic.NewSendTopic()
 	loggerTopic := logger_topic.NewEnableTopic()
 	boardIdToBoard := make(map[abstraction.BoardId]string)
-	for name, id := range info.BoardIds {
+	for name, id := range adj.Info.BoardIds {
 		boardIdToBoard[abstraction.BoardId(id)] = name
 	}
 	messageTopic := message_topic.NewUpdateTopic(boardIdToBoard)
@@ -184,8 +194,8 @@ func main() {
 
 	// <--- vehicle --->
 	ipToBoardId := make(map[string]abstraction.BoardId)
-	for name, ip := range info.Addresses.Boards {
-		ipToBoardId[ip.String()] = abstraction.BoardId(info.BoardIds[name])
+	for name, ip := range adj.Info.Addresses {
+		ipToBoardId[ip] = abstraction.BoardId(adj.Info.BoardIds[name])
 	}
 
 	vehicle := vehicle.New(trace.Logger)
@@ -198,30 +208,30 @@ func main() {
 
 	// <--- transport --->
 	// Load and set packet decoder and encoder
-	decoder, encoder := getTransportDecEnc(info, podData)
+	decoder, encoder := getTransportDecEnc(adj.Info, podData)
 	transp.WithDecoder(decoder).WithEncoder(encoder)
 
 	// Set package id to target map
 	for _, board := range podData.Boards {
 		for _, packet := range board.Packets {
 			transp.SetIdTarget(abstraction.PacketId(packet.Id), abstraction.TransportTarget(board.Name))
 		}
-		transp.SetTargetIp(info.Addresses.Boards[board.Name].String(), abstraction.TransportTarget(board.Name))
+		transp.SetTargetIp(adj.Info.Addresses[board.Name], abstraction.TransportTarget(board.Name))
 	}
 
 	// Start handling TCP client connections
 	i := 0
 	serverTargets := make(map[string]abstraction.TransportTarget)
 	for _, board := range podData.Boards {
 		if !common.Contains(config.Vehicle.Boards, board.Name) {
-			serverTargets[fmt.Sprintf("%s:%d", info.Addresses.Boards[board.Name], info.Ports.TcpClient)] = abstraction.TransportTarget(board.Name)
+			serverTargets[fmt.Sprintf("%s:%d", adj.Info.Addresses[board.Name], adj.Info.Ports[TcpClient])] = abstraction.TransportTarget(board.Name)
 			continue
 		}
-		backendTcpClientAddr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", info.Addresses.Backend.String(), info.Ports.TcpClient+uint16(i)))
+		backendTcpClientAddr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", adj.Info.Addresses[BACKEND], adj.Info.Ports[TcpClient]+uint16(i)))
 		if err != nil {
 			panic("Failed to resolve local backend TCP client address")
 		}
-		go transp.HandleClient(tcp.NewClientConfig(backendTcpClientAddr), fmt.Sprintf("%s:%d", info.Addresses.Boards[board.Name], info.Ports.TcpServer))
+		go transp.HandleClient(tcp.NewClientConfig(backendTcpClientAddr), fmt.Sprintf("%s:%d", adj.Info.Addresses[board.Name], adj.Info.Ports[TcpServer]))
 		i++
 	}
 
@@ -231,7 +241,7 @@ func main() {
 			KeepAlive: time.Second,
 		},
 		Context: context.TODO(),
-	}, fmt.Sprintf("%s:%d", info.Addresses.Backend, info.Ports.TcpServer))
+	}, fmt.Sprintf("%s:%d", adj.Info.Addresses[BACKEND], adj.Info.Ports[TcpServer]))
 
 	// Start handling the sniffer
 	source, err := pcap.OpenLive(dev.Name, 1500, true, pcap.BlockForever)
@@ -247,10 +257,16 @@ func main() {
 	}
 
 	boardIps := make([]net.IP, 0)
-	for _, board := range info.Addresses.Boards {
-		boardIps = append(boardIps, board)
+	for boardName, _ := range adj.Info.BoardIds {
+		boardIps = append(boardIps, net.ParseIP(adj.Info.Addresses[boardName]))
 	}
-	filter := getFilter(boardIps, info.Addresses.Backend, info.Ports.UDP)
+
+	boardIpsStr := make([]string, 0)
+	for boardName, _ := range adj.Info.BoardIds {
+		boardIpsStr = append(boardIpsStr, adj.Info.Addresses[boardName])
+	}
+
+	filter := getFilter(boardIps, net.ParseIP(adj.Info.Addresses[BACKEND]), adj.Info.Ports[UDP])
 	trace.Warn().Str("filter", filter).Msg("filter")
 	err = source.SetBPFFilter(filter)
 	if err != nil {
@@ -267,8 +283,8 @@ func main() {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error creating orderData handler: %v\n", err)
 	}
-	uploadableBords := common.Filter(common.Keys(info.Addresses.Boards), func(item string) bool {
-		return item != config.Excel.Parse.Global.BLCUAddressKey
+	uploadableBords := common.Filter(common.Keys(adj.Info.Addresses), func(item string) bool {
+		return item != adj.Info.Addresses[BLCU]
 	})
 	programableBoardsHandle, err := h.HandleDataJSON("programableBoards.json", uploadableBords)
 	if err != nil {
@@ -292,7 +308,7 @@ func main() {
 
 	// <--- SNTP --->
 	if *enableSNTP {
-		sntpAddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", info.Addresses.Backend, info.Ports.SNTP))
+		sntpAddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", adj.Info.Addresses[BACKEND], adj.Info.Ports[SNTP]))
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error resolving sntp address: %v\n", err)
 			os.Exit(1)
@@ -422,7 +438,7 @@ func getConfig(path string) Config {
 	return config
 }
 
-func getTransportDecEnc(info info.Info, podData pod_data.PodData) (*presentation.Decoder, *presentation.Encoder) {
+func getTransportDecEnc(info adj_module.Info, podData pod_data.PodData) (*presentation.Decoder, *presentation.Encoder) {
 	decoder := presentation.NewDecoder(binary.LittleEndian, trace.Logger)
 	encoder := presentation.NewEncoder(binary.LittleEndian, trace.Logger)
 
@@ -485,13 +501,14 @@ func getTransportDecEnc(info info.Info, podData pod_data.PodData) (*presentation
 		encoder.SetPacketEncoder(id, dataEncoder)
 	}
 
-	decoder.SetPacketDecoder(abstraction.PacketId(info.MessageIds.BlcuAck), blcu_packet.NewDecoder())
+	decoder.SetPacketDecoder(abstraction.PacketId(info.MessageIds[BlcuAck]), blcu_packet.NewDecoder())
 
+	// TODO Solve this foking mess
 	stateOrdersDecoder := order.NewDecoder(binary.LittleEndian)
-	stateOrdersDecoder.SetActionId(abstraction.PacketId(info.MessageIds.AddStateOrder), stateOrdersDecoder.DecodeAdd)
-	stateOrdersDecoder.SetActionId(abstraction.PacketId(info.MessageIds.RemoveStateOrder), stateOrdersDecoder.DecodeRemove)
-	decoder.SetPacketDecoder(abstraction.PacketId(info.MessageIds.AddStateOrder), stateOrdersDecoder)
-	decoder.SetPacketDecoder(abstraction.PacketId(info.MessageIds.RemoveStateOrder), stateOrdersDecoder)
+	stateOrdersDecoder.SetActionId(abstraction.PacketId(info.MessageIds[AddStateOrder]), stateOrdersDecoder.DecodeAdd)
+	stateOrdersDecoder.SetActionId(abstraction.PacketId(info.MessageIds[RemoveStateOrder]), stateOrdersDecoder.DecodeRemove)
+	decoder.SetPacketDecoder(abstraction.PacketId(info.MessageIds[AddStateOrder]), stateOrdersDecoder)
+	decoder.SetPacketDecoder(abstraction.PacketId(info.MessageIds[RemoveStateOrder]), stateOrdersDecoder)
 
 	protectionDecoder := protection.NewDecoder(binary.LittleEndian)
 	protectionDecoder.SetSeverity(1000, protection.FaultSeverity).SetSeverity(2000, protection.WarningSeverity).SetSeverity(3000, protection.OkSeverity)