Optimize

src/client/client_v5.rs

@@ -1,43 +1,46 @@
-use crate::packet::publish_packet::{PublishPacket, QualityOfService};
 use crate::network::network_trait::{Network, NetworkError};
 use crate::packet::connack_packet::ConnackPacket;
 use crate::packet::connect_packet::ConnectPacket;
 use crate::packet::disconnect_packet::DisconnectPacket;
 use crate::packet::mqtt_packet::Packet;
+use crate::packet::publish_packet::{PublishPacket, QualityOfService};
 use crate::packet::publish_packet::QualityOfService::QoS1;
 use crate::utils::buffer_reader::BuffReader;
 
-pub struct MqttClientV5<T, const MAX_PROPERTIES: usize> {
+pub struct MqttClientV5<'a, T, const MAX_PROPERTIES: usize> {
-    network_driver: T,
+    network_driver: &'a mut T,
+    buffer: &'a mut [u8]
 }
 
-impl<'a, T, const MAX_PROPERTIES: usize> MqttClientV5<T, MAX_PROPERTIES>
+impl<'a, T, const MAX_PROPERTIES: usize> MqttClientV5<'a, T, MAX_PROPERTIES>
 where
     T: Network
 {
-    pub fn new(network_driver: T) -> Self {
+    pub fn new(network_driver: &'a mut T, buffer: &'a mut [u8]) -> Self {
         Self {
             network_driver,
+            buffer
         }
     }
     // connect -> connack -> publish -> QoS ? -> disconn
-    pub async fn send_message(& mut self, topic_name: & str, message: & str, buffer: &'a mut [u8], qos: QualityOfService) -> Result<(), NetworkError> {
+    pub async fn send_message(&'a mut self, topic_name: & str, message: & str, qos: QualityOfService) -> Result<(), NetworkError> {
         //connect
         self.network_driver.create_connection().await ?;
 
         let mut connect = ConnectPacket::<3, 0>::clean();
-        let mut len = connect.encode(buffer);
+        let mut len = connect.encode(self.buffer);
-        self.network_driver.send(buffer, len).await ?;
+
+        self.network_driver.send(self.buffer, len).await ?;
         //connack
-        let connack: ConnackPacket<MAX_PROPERTIES> = self.receive::<ConnackPacket<MAX_PROPERTIES>>(buffer).await ?;
+        let connack: ConnackPacket<MAX_PROPERTIES> = self.receive::<ConnackPacket<MAX_PROPERTIES>>().await ?;
         if connack.connect_reason_code != 0x00 {
             todo!();
         }
 
         // publish
         let mut packet = PublishPacket::<5>::new(topic_name, message);
-        len = packet.encode(buffer);
+        len = packet.encode(self.buffer);
-        self.network_driver.send(buffer, len).await ?;
+        self.network_driver.send(self.buffer, len).await ?;
 
         //QoS1
         if <QualityOfService as Into<u8>>::into(qos) == <QualityOfService as Into<u8>>::into(QoS1) {
@@ -46,19 +49,19 @@ where
 
         //Disconnect
         let mut disconnect = DisconnectPacket::<5>::new();
-        len = disconnect.encode(buffer);
+        len = disconnect.encode(self.buffer);
-        self.network_driver.send(buffer, len);
+        self.network_driver.send(self.buffer, len);
         Ok(())
     }
 
-    pub async fn receive<P: Packet<'a>>(& mut self, buffer: &'a mut [u8]) -> Result<P, NetworkError> {
+    pub async fn receive<P: Packet<'p>>(&'a mut self) -> Result<P, NetworkError> {
-        self.network_driver.receive(buffer).await ?;
+        self.network_driver.receive(self.buffer).await ?;
         let mut packet = P::new();
-        packet.decode(&mut BuffReader::new(buffer));
+        packet.decode(&mut BuffReader::new(self.buffer));
         return Ok(packet);
     }
 
-    pub async fn receive_message(& mut self, buffer: & mut [u8]) -> Result<(), NetworkError> {
+    pub async fn receive_message(&'a mut self) -> Result<(), NetworkError> {
         return Ok(());
     }
 }

src/network/network_trait.rs

@@ -1,6 +1,6 @@
 use core::fmt::Error;
-
 use core::future::Future;
+
 use crate::packet::mqtt_packet::Packet;
 
 pub enum NetworkError {

src/packet/auth_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;

src/packet/connack_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;

src/packet/connect_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BinaryData;
 use crate::utils::buffer_reader::BuffReader;

src/packet/disconnect_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;

src/packet/puback_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;

src/packet/pubcomp_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;

src/packet/publish_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::packet::publish_packet::QualityOfService::{INVALID, QoS0, QoS1, QoS2};
 use crate::utils::buffer_reader::BuffReader;

src/packet/pubrec_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;

src/packet/pubrel_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;

src/packet/suback_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;

src/packet/subscription_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_reader::TopicFilter;

src/packet/unsubscription_packet.rs

@@ -1,6 +1,6 @@
-use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use heapless::Vec;
 
+use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
 use crate::packet::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_reader::TopicFilter;

src/tokio_network.rs

@@ -4,9 +4,11 @@ use core::borrow::BorrowMut;
 use core::fmt::Error;
 use core::future::Future;
 use core::ptr::null;
+
 use embassy::io::WriteAll;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::{TcpListener, TcpStream};
+
 use crate::network::network_trait::{Network, NetworkError};
 use crate::packet::mqtt_packet::Packet;
 

src/utils/buffer_writer.rs

@@ -1,8 +1,10 @@
+use core::str;
+
+use heapless::Vec;
+
 use crate::encoding::variable_byte_integer::{VariableByteInteger, VariableByteIntegerEncoder};
 use crate::packet::property::Property;
 use crate::utils::buffer_reader::{BinaryData, EncodedString, StringPair, TopicFilter};
-use core::str;
-use heapless::Vec;
 
 pub struct BuffWriter<'a> {
     buffer: &'a mut [u8],