Use new http server and simplify config.toml

Author: jmaralo

backend/cmd/config.toml

@@ -8,30 +8,11 @@ pod_data = "/podDataStructure"
 order_data = "/orderStructures"
 programable_boards = "/uploadableBoards"
 connections = "/backend"
-file_server = "/"
+files = "/"
 
 [vehicle]
 boards = ["VCU"]
 
-[vehicle.network]
-tcp_client_tag = "TCP_CLIENT"
-tcp_server_tag = "TCP_SERVER"
-udp_tag = "UDP"
-# sniffer = { mtu = 1500, interface = "lo" }
-mtu = 1500
-interface = "lo"
-# blcu_ack_id = "blcu_ack"
-timeout = "1s"
-
-[vehicle.messages]
-info_id_key = "info"
-fault_id_key = "fault"
-warning_id_key = "warning"
-error_id_key = "error"
-blcu_ack_id_key = "blcu_ack"
-add_state_orders_id_key = "add_state_orders"
-remove_state_orders_id_key = "remove_state_orders"
-
 [excel.download]
 id="1NyNaAOw_6iWtnCpEg73AtSSFx1fMdhPRmmdOhjgjCZI"
 name = "ade.xlsx"
@@ -49,49 +30,3 @@ units_table = "units"
 ports_table = "ports"
 board_ids_table = "board_ids"
 message_ids_table = "message_ids"
-
-[logger_handler]
-topics = { enable = "logger/enable" }
-base_path = "log"
-flush_interval = "5s"
-
-[packet_logger]
-file_name = "packets"
-flush_interval = "5s"
-
-[value_logger]
-folder_name = "values"
-flush_interval = "5s"
-
-[order_logger]
-file_name = "orders"
-flush_interval = "5s"
-
-[protection_logger]
-file_name = "protections"
-flush_interval = "5s"
-
-[orders]
-send_topic = "order/send"
-
-[messages]
-update_topic = "message/update"
-
-[data_transfer]
-fps = 20
-topics = { update = "podData/update" }
-
-[connections]
-update_topic = "connection/update"
-
-[blcu]
-download_path = "downloads"
-
-[blcu.packets]
-upload = { id = 700, field = "write_board" }
-download = { id = 701, field = "read_board" }
-ack = { name = "tftp_ack" }
-
-[blcu.topics]
-upload = "blcu/upload"
-download = "blcu/download"

backend/cmd/main.go

@@ -21,7 +21,6 @@ import (
 	"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/server"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/update_factory"
 	vehicle_models "github.com/HyperloopUPV-H8/h9-backend/internal/vehicle/models"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
@@ -31,6 +30,12 @@ import (
 	logger_topic "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/logger"
 	message_topic "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/message"
 	order_topic "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/order"
+	h "github.com/HyperloopUPV-H8/h9-backend/pkg/http"
+	"github.com/HyperloopUPV-H8/h9-backend/pkg/logger"
+	data_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/data"
+	messages_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/messages"
+	order_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/order"
+	state_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/state"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/network/sniffer"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/transport/network/tcp"
@@ -47,12 +52,6 @@ import (
 	"github.com/google/gopacket/pcap"
 	"github.com/pelletier/go-toml/v2"
 	trace "github.com/rs/zerolog/log"
-
-	"github.com/HyperloopUPV-H8/h9-backend/pkg/logger"
-	data_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/data"
-	messages_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/messages"
-	order_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/order"
-	state_logger "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/state"
 )
 
 var traceLevel = flag.String("trace", "info", "set the trace level (\"fatal\", \"error\", \"warn\", \"info\", \"debug\", \"trace\")")
@@ -106,7 +105,6 @@ func main() {
 		trace.Fatal().Err(err).Msg("Error selecting device")
 		panic(err)
 	}
-	config.Vehicle.Network.Interface = dev.Name
 
 	vehicleOrders, err := vehicle_models.NewVehicleOrders(podData.Boards, config.Excel.Parse.Global.BLCUAddressKey)
 	if err != nil {
@@ -224,36 +222,41 @@ func main() {
 	vehicle.SetTransport(transp)
 
 	// <--- http server --->
+	podDataHandle, err := h.HandleDataJSON("podData.json", pod_data.GetDataOnlyPodData(podData))
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error creating podData handler: %v\n", err)
+	}
+	orderDataHandle, err := h.HandleDataJSON("orderData.json", vehicleOrders)
+	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
 	})
-
-	endpointData := server.EndpointData{
-		PodData:           pod_data.GetDataOnlyPodData(podData),
-		OrderData:         vehicleOrders,
-		ProgramableBoards: uploadableBords,
-	}
-
-	serverHandler, err := server.New(upgrader, endpointData, config.Server)
+	programableBoardsHandle, err := h.HandleDataJSON("programableBoards.json", uploadableBords)
 	if err != nil {
-		trace.Fatal().Err(err).Msg("Error creating server")
-		panic(err)
+		fmt.Fprintf(os.Stderr, "error creating programableBoards handler: %v\n", err)
 	}
 
-	errs := serverHandler.ListenAndServe()
+	for _, server := range config.Server {
+		mux := h.NewMux(
+			h.Endpoint("/backend"+server.Endpoints.PodData, podDataHandle),
+			h.Endpoint("/backend"+server.Endpoints.OrderData, orderDataHandle),
+			h.Endpoint("/backend"+server.Endpoints.ProgramableBoards, programableBoardsHandle),
+			h.Endpoint(server.Endpoints.Connections, upgrader),
+			h.Endpoint(server.Endpoints.Files, h.HandleStatic(server.StaticPath)),
+		)
+
+		httpServer := h.NewServer(server.Addr, mux)
+		go httpServer.ListenAndServe()
+	}
 
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)
 
-	for {
-		select {
-		case err := <-errs:
-			trace.Error().Err(err).Msg("Error in server")
-
-		case <-interrupt:
-			trace.Info().Msg("Shutting down")
-			return
-		}
+	for range interrupt {
+		trace.Info().Msg("Shutting down")
+		return
 	}
 }
 

backend/internal/server/config.go

@@ -3,10 +3,9 @@ package server
 type Config map[string]ServerConfig
 
 type ServerConfig struct {
-	Addr           string         `toml:"address" default:"localhost:4000"`
-	MaxConnections *int32         `toml:"client_limit,omitempty"`
-	Endpoints      EndpointConfig `toml:"endpoints"`
-	StaticPath     string         `toml:"static" default:"./static"`
+	Addr       string         `toml:"address" default:"localhost:4000"`
+	Endpoints  EndpointConfig `toml:"endpoints"`
+	StaticPath string         `toml:"static" default:"./static"`
 }
 
 type EndpointConfig struct {
@@ -16,9 +15,3 @@ type EndpointConfig struct {
 	Connections       string `toml:"connections" default:"/backend"`
 	Files             string `toml:"files" default:"/"`
 }
-
-type EndpointData struct {
-	PodData           any
-	OrderData         any
-	ProgramableBoards any
-}