wip: fix compilation erros and introduce async trait

Signed-off-by: George Cosma <george.cosma@wyliodrin.com>

Author: George Cosma

tockloader-lib/Cargo.toml

@@ -19,3 +19,4 @@ bytes = "1.7.1"
 toml = "0.8.19"
 serde = { version = "1.0.210", features = ["derive"] }
 thiserror = "1.0.63"
+async-trait = "0.1.88"

tockloader-lib/src/command_impl/probers/info.rs

@@ -1,3 +1,5 @@
+use async_trait::async_trait;
+
 use crate::attributes::app_attributes::AppAttributes;
 use crate::attributes::general_attributes::GeneralAttributes;
 use crate::attributes::system_attributes::SystemAttributes;
@@ -6,6 +8,7 @@ use crate::connection::{Connection, ProbeRSConnection};
 use crate::errors::TockloaderError;
 use crate::CommandInfo;
 
+#[async_trait]
 impl CommandInfo for ProbeRSConnection {
     async fn info(
         &mut self,

tockloader-lib/src/command_impl/probers/install.rs

@@ -1,3 +1,4 @@
+use async_trait::async_trait;
 use probe_rs::flashing::DownloadOptions;
 use probe_rs::MemoryInterface;
 use tbf_parser::parse::parse_tbf_header_lengths;
@@ -8,6 +9,7 @@ use crate::errors::TockloaderError;
 use crate::tabs::tab::Tab;
 use crate::CommandInstall;
 
+#[async_trait]
 impl CommandInstall for ProbeRSConnection {
     async fn install_app(
         &mut self,

tockloader-lib/src/command_impl/probers/list.rs

@@ -1,9 +1,12 @@
+use async_trait::async_trait;
+
 use crate::attributes::app_attributes::AppAttributes;
 use crate::board_settings::BoardSettings;
 use crate::connection::{Connection, ProbeRSConnection};
 use crate::errors::TockloaderError;
 use crate::CommandList;
 
+#[async_trait]
 impl CommandList for ProbeRSConnection {
     async fn list(
         &mut self,

tockloader-lib/src/command_impl/serial/info.rs

@@ -1,5 +1,7 @@
 use std::time::Duration;
 
+use async_trait::async_trait;
+
 use crate::attributes::app_attributes::AppAttributes;
 use crate::attributes::general_attributes::GeneralAttributes;
 use crate::attributes::system_attributes::SystemAttributes;
@@ -9,6 +11,7 @@ use crate::connection::{Connection, SerialConnection};
 use crate::errors::TockloaderError;
 use crate::CommandInfo;
 
+#[async_trait]
 impl CommandInfo for SerialConnection {
     async fn info(
         &mut self,

tockloader-lib/src/command_impl/serial/install.rs

@@ -1,9 +1,12 @@
+use async_trait::async_trait;
+
 use crate::board_settings::BoardSettings;
 use crate::connection::SerialConnection;
 use crate::errors::TockloaderError;
 use crate::tabs::tab::Tab;
 use crate::CommandInstall;
 
+#[async_trait]
 impl CommandInstall for SerialConnection {
     async fn install_app(
         &mut self,

tockloader-lib/src/command_impl/serial/list.rs

@@ -1,12 +1,15 @@
 use std::time::Duration;
 
+use async_trait::async_trait;
+
 use crate::attributes::app_attributes::AppAttributes;
 use crate::board_settings::BoardSettings;
 use crate::bootloader_serial::{ping_bootloader_and_wait_for_response, Response};
 use crate::connection::{Connection, SerialConnection};
 use crate::errors::TockloaderError;
 use crate::CommandList;
 
+#[async_trait]
 impl CommandList for SerialConnection {
     async fn list(
         &mut self,

tockloader-lib/src/connection.rs

@@ -1,5 +1,6 @@
 use std::time::Duration;
 
+use async_trait::async_trait;
 use probe_rs::probe::DebugProbeInfo;
 use probe_rs::{Permissions, Session};
 use tokio::io::AsyncWriteExt;
@@ -47,6 +48,7 @@ impl Default for SerialTargetInfo {
     }
 }
 
+#[async_trait]
 pub trait Connection {
     async fn open(&mut self) -> Result<(), TockloaderError>;
     /// Closes the connection, if it is open. If it is not open, it does
@@ -75,6 +77,7 @@ impl ProbeRSConnection {
     }
 }
 
+#[async_trait]
 impl Connection for ProbeRSConnection {
     async fn open(&mut self) -> Result<(), TockloaderError> {
         let probe = self
@@ -121,6 +124,7 @@ impl SerialConnection {
     }
 }
 
+#[async_trait]
 impl Connection for SerialConnection {
     async fn open(&mut self) -> Result<(), TockloaderError> {
         let builder = tokio_serial::new(&self.port, self.target_info.baud_rate)
@@ -145,7 +149,7 @@ impl Connection for SerialConnection {
 
     async fn close(&mut self) -> Result<(), TockloaderError> {
         if let Some(mut stream) = self.stream.take() {
-            stream.shutdown().await;
+            stream.shutdown().await?;
         }
         Ok(())
     }