Refactor packages

src/client/client_config.rs

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-use crate::packet::publish_packet::QualityOfService;
+use crate::packet::v5::publish_packet::QualityOfService;
 use crate::utils::types::{BinaryData, EncodedString};
 
 pub struct ClientConfig<'a> {

src/client/client_v5.rs

@@ -1,17 +1,17 @@
 use crate::client::client_config::ClientConfig;
 use crate::network::network_trait::Network;
-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::pingreq_packet::PingreqPacket;
-use crate::packet::pingresp_packet::PingrespPacket;
-use crate::packet::puback_packet::PubackPacket;
-use crate::packet::publish_packet::QualityOfService::QoS1;
-use crate::packet::publish_packet::{PublishPacket, QualityOfService};
-use crate::packet::reason_codes::ReasonCode;
-use crate::packet::suback_packet::SubackPacket;
-use crate::packet::subscription_packet::SubscriptionPacket;
+use crate::packet::v5::connack_packet::ConnackPacket;
+use crate::packet::v5::connect_packet::ConnectPacket;
+use crate::packet::v5::disconnect_packet::DisconnectPacket;
+use crate::packet::v5::mqtt_packet::Packet;
+use crate::packet::v5::pingreq_packet::PingreqPacket;
+use crate::packet::v5::pingresp_packet::PingrespPacket;
+use crate::packet::v5::puback_packet::PubackPacket;
+use crate::packet::v5::publish_packet::QualityOfService::QoS1;
+use crate::packet::v5::publish_packet::{PublishPacket, QualityOfService};
+use crate::packet::v5::reason_codes::ReasonCode;
+use crate::packet::v5::suback_packet::SubackPacket;
+use crate::packet::v5::subscription_packet::SubscriptionPacket;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::rng_generator::CountingRng;
 use crate::utils::types::BufferError;

src/main.rs

@@ -8,11 +8,11 @@ use tokio::{join, task};
 use rust_mqtt::client::client_config::ClientConfig;
 use rust_mqtt::client::client_v5::MqttClientV5;
 use rust_mqtt::network::network_trait::{Network, NetworkError};
-use rust_mqtt::packet::connect_packet::ConnectPacket;
-use rust_mqtt::packet::mqtt_packet::Packet;
-use rust_mqtt::packet::publish_packet::QualityOfService::QoS1;
-use rust_mqtt::packet::publish_packet::{PublishPacket, QualityOfService};
-use rust_mqtt::packet::subscription_packet::SubscriptionPacket;
+use rust_mqtt::packet::v5::connect_packet::ConnectPacket;
+use rust_mqtt::packet::v5::mqtt_packet::Packet;
+use rust_mqtt::packet::v5::publish_packet::QualityOfService::QoS1;
+use rust_mqtt::packet::v5::publish_packet::{PublishPacket, QualityOfService};
+use rust_mqtt::packet::v5::subscription_packet::SubscriptionPacket;
 use rust_mqtt::tokio_network::TokioNetwork;
 
 async fn receive() {

src/network/network_trait.rs

@@ -1,6 +1,6 @@
 use core::future::Future;
 
-use crate::packet::reason_codes::ReasonCode;
+use crate::packet::v5::reason_codes::ReasonCode;
 
 #[derive(Debug)]
 pub enum NetworkError {

src/packet/mod.rs

@@ -22,23 +22,4 @@
  * SOFTWARE.
  */
 
-pub mod auth_packet;
-pub mod connack_packet;
-pub mod mqtt_packet;
-pub mod packet_type;
-pub mod property;
-pub mod puback_packet;
-pub mod pubcomp_packet;
-pub mod publish_packet;
-pub mod pubrec_packet;
-pub mod pubrel_packet;
-pub mod subscription_packet;
-pub mod unsubscription_packet;
-
-pub mod connect_packet;
-pub mod disconnect_packet;
-pub mod pingreq_packet;
-pub mod pingresp_packet;
-pub mod reason_codes;
-pub mod suback_packet;
-pub mod unsuback_packet;
+pub mod v5;

src/packet/v5/auth_packet.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/connack_packet.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/connect_packet.rs

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

src/packet/v5/disconnect_packet.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/mod.rs

@@ -0,0 +1,44 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) [2022] [Ondrej Babec <ond.babec@gmail.com>]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+pub mod auth_packet;
+pub mod connack_packet;
+pub mod mqtt_packet;
+pub mod packet_type;
+pub mod property;
+pub mod puback_packet;
+pub mod pubcomp_packet;
+pub mod publish_packet;
+pub mod pubrec_packet;
+pub mod pubrel_packet;
+pub mod subscription_packet;
+pub mod unsubscription_packet;
+
+pub mod connect_packet;
+pub mod disconnect_packet;
+pub mod pingreq_packet;
+pub mod pingresp_packet;
+pub mod reason_codes;
+pub mod suback_packet;
+pub mod unsuback_packet;

src/packet/v5/mqtt_packet.rs

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-use crate::packet::packet_type::PacketType;
+use crate::packet::v5::packet_type::PacketType;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::types::BufferError;
 

src/packet/v5/pingreq_packet.rs

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/pingresp_packet.rs

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/puback_packet.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/pubcomp_packet.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/publish_packet.rs

@@ -25,8 +25,8 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
-use crate::packet::publish_packet::QualityOfService::{QoS0, QoS1, QoS2, INVALID};
+use crate::packet::v5::mqtt_packet::Packet;
+use crate::packet::v5::publish_packet::QualityOfService::{QoS0, QoS1, QoS2, INVALID};
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::{BufferError, EncodedString};

src/packet/v5/pubrec_packet.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/pubrel_packet.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::BufferError;

src/packet/v5/suback_packet.rs

@@ -24,7 +24,7 @@
 
 use heapless::Vec;
 
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::types::BufferError;
 

src/packet/v5/subscription_packet.rs

@@ -27,8 +27,8 @@ use heapless::Vec;
 use super::packet_type::PacketType;
 use super::property::Property;
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
-use crate::packet::publish_packet::QualityOfService;
+use crate::packet::v5::mqtt_packet::Packet;
+use crate::packet::v5::publish_packet::QualityOfService;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::{BufferError, TopicFilter};

src/packet/v5/unsuback_packet.rs

@@ -24,7 +24,7 @@
 
 use heapless::Vec;
 
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::types::BufferError;
 

src/packet/v5/unsubscription_packet.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::VariableByteIntegerEncoder;
-use crate::packet::mqtt_packet::Packet;
+use crate::packet::v5::mqtt_packet::Packet;
 use crate::utils::buffer_reader::BuffReader;
 use crate::utils::buffer_writer::BuffWriter;
 use crate::utils::types::{BufferError, TopicFilter};

src/tokio_network.rs

@@ -6,7 +6,7 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
 
 use crate::network::network_trait::Network;
-use crate::packet::reason_codes::ReasonCode;
+use crate::packet::v5::reason_codes::ReasonCode;
 
 pub struct TokioNetwork {
     ip: [u8; 4],

src/utils/buffer_writer.rs

@@ -25,7 +25,7 @@
 use heapless::Vec;
 
 use crate::encoding::variable_byte_integer::{VariableByteInteger, VariableByteIntegerEncoder};
-use crate::packet::property::Property;
+use crate::packet::v5::property::Property;
 use crate::utils::types::{BinaryData, BufferError, EncodedString, StringPair, TopicFilter};
 
 pub struct BuffWriter<'a> {