Merge branch 'main' into develop

Author: jmaralo

backend/cmd/config.toml

@@ -11,7 +11,7 @@ connections = "/backend"
 file_server = "/"
 
 [vehicle]
-boards = ["BLCU"]
+boards = ["VCU"]
 
 [vehicle.network]
 tcp_client_tag = "TCP_CLIENT"

backend/cmd/main.go

@@ -13,7 +13,6 @@ import (
 	"runtime"
 	"runtime/pprof"
 	"strings"
-	"time"
 
 	blcuPackage "github.com/HyperloopUPV-H8/h9-backend/internal/blcu"
 	"github.com/HyperloopUPV-H8/h9-backend/internal/common"
@@ -164,14 +163,11 @@ func main() {
 
 	transp := transport.NewTransport()
 
-	prev := time.Now()
 	transp.SetAPI(&TransportAPI{
 		OnNotification: func(notification abstraction.TransportNotification) {
 			packet := notification.(transport.PacketNotification)
 			switch p := packet.Packet.(type) {
 			case *data.Packet:
-				fmt.Println(time.Since(prev))
-				prev = time.Now()
 				if _, ok := orders[p.Id()]; ok {
 					loggerHandler.Log(order_logger.LoggableOrder(*p))
 					return
@@ -206,7 +202,9 @@ func main() {
 			}
 		},
 
-		OnConnectionUpdate: func(target abstraction.TransportTarget, isConnected bool) {},
+		OnConnectionUpdate: func(target abstraction.TransportTarget, isConnected bool) {
+			connectionTransfer.Update(string(target), isConnected)
+		},
 	})
 
 	// Load and set packet decoder and encoder
@@ -221,7 +219,7 @@ func main() {
 	}
 
 	// Start handling TCP client connections
-	backendTcpClientAddr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", info.Addresses.Backend, info.Ports.TcpClient))
+	backendTcpClientAddr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", info.Addresses.Backend.String(), info.Ports.TcpClient))
 	if err != nil {
 		panic("Failed to resolve local backend TCP client address")
 	}
@@ -231,7 +229,7 @@ func main() {
 			serverTargets[fmt.Sprintf("%s:%d", info.Addresses.Boards[board.Name], info.Ports.TcpClient)] = abstraction.TransportTarget(board.Name)
 			continue
 		}
-		go transp.HandleClient(tcp.NewClient(backendTcpClientAddr), abstraction.TransportTarget(board.Name), "tcp", string(info.Addresses.Boards[board.Name]))
+		go transp.HandleClient(tcp.NewClient(backendTcpClientAddr), abstraction.TransportTarget(board.Name), "tcp", fmt.Sprintf("%s:%d", info.Addresses.Boards[board.Name], info.Ports.TcpServer))
 	}
 
 	// Start handling TCP server connections

backend/pkg/transport/network/tcp/client.go

@@ -2,8 +2,10 @@ package tcp
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
+	"syscall"
 	"time"
 
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
@@ -64,7 +66,7 @@ func NewClient(local net.Addr) ClientConfig {
 
 		Context: context.TODO(),
 
-		MaxRetries: 30,
+		MaxRetries: -1,
 		Backoff:    NewExponBackoff(defaultBackoffMin, defaultBackoffExp, defaultBackoffMax),
 	}
 }
@@ -82,7 +84,7 @@ func (config ClientConfig) Dial(network, remote string) (net.Conn, error) {
 			return nil, config.Context.Err()
 		}
 
-		if netErr, ok := err.(net.Error); !ok || !netErr.Timeout() {
+		if netErr, ok := err.(net.Error); !errors.Is(err, syscall.ECONNREFUSED) && (!ok || !netErr.Timeout()) {
 			return nil, err
 		}
 		time.Sleep(config.Backoff(config.CurrentRetries))

common-front/lib/store/connectionsStore.ts

@@ -45,7 +45,10 @@ export const useConnectionsStore = create<ConnectionsStore>((set) => ({
     setConnections: (connections: Connection[]) => {
         set(state => ({
             ...state,
-            boards: connections
+            connections: {
+                ...state.connections,
+                boards: connections
+            }
         }))
     }
 }))