refactor(decompression-plz): renamed dtraits to decompress_trait

Author: darkseid-is

decompression-plz/src/content_length.rs

@@ -2,7 +2,7 @@ use body_plz::variants::Body;
 use bytes::BytesMut;
 use header_plz::const_headers::CONTENT_LENGTH;
 
-use crate::dtraits::DecompressTrait;
+use crate::decompress_trait::DecompressTrait;
 
 pub fn add_body_and_update_cl<T>(message: &mut T, body: BytesMut)
 where

decompression-plz/src/decode_struct.rs

@@ -2,7 +2,7 @@ use bytes::BytesMut;
 use header_plz::body_headers::BodyHeader;
 use header_plz::body_headers::encoding_info::EncodingInfo;
 
-use crate::dtraits::DecompressTrait;
+use crate::decompress_trait::DecompressTrait;
 
 pub struct DecodeStruct<'a, T> {
     pub message: &'a mut T,

decompression-plz/src/dtraits.rs decompression-plz/src/decompress_trait.rsdecompression-plz/src/dtraits.rs renamed to decompression-plz/src/decompress_trait.rs

@@ -470,7 +470,7 @@ mod tests {
             assert_eq!(err.reason, MultiDecompressErrorReason::Corrupt);
             // TODO: FIX test
             // matches!(err.error, assert_error);
-
+            assert!(!ds.writer.get_ref().is_empty());
             assert_eq!(ds.encoding_info, original_info);
         }
     }
@@ -507,6 +507,7 @@ mod tests {
             panic!("Expected Partial error, got: {:?}", e.reason);
         }
 
+        assert!(ds.writer.get_ref().is_empty());
         assert_eq!(ds.encoding_info, verify_encodings);
     }
 

decompression-plz/src/decompression/dstruct.rs

@@ -3,6 +3,7 @@ use crate::decompression::{
 };
 use bytes::{BufMut, BytesMut, buf::Writer};
 use header_plz::body_headers::encoding_info::EncodingInfo;
+use tracing::error;
 
 /*
 1. (Main + Extra) - compressed ie. compresssed together
@@ -144,9 +145,12 @@ impl<'a> DecompressionState<'a> {
                             main_plus_extra_decompressed,
                         )
                     }
-                    Err(_) => DecompressionState::ExtraRawMainTry(
-                        decompression_struct,
-                    ),
+                    Err(e) => {
+                        error!("[-] decompressing main + extra| {}", e.reason);
+                        DecompressionState::ExtraRawMainTry(
+                            decompression_struct,
+                        )
+                    }
                 }
             }
             /* Main - try decompress

decompression-plz/src/decompression/state.rs

@@ -5,9 +5,9 @@ use bytes::BytesMut;
 use crate::state::DecodeState;
 pub mod content_length;
 mod decode_struct;
+mod decompress_trait;
 mod decompression;
-mod dtraits;
-pub use dtraits::DecompressTrait;
+pub use decompress_trait::DecompressTrait;
 mod state;
 
 pub fn decompress<T>(

decompression-plz/src/lib.rs

@@ -7,10 +7,10 @@ use tracing::error;
 use crate::{
     content_length::add_body_and_update_cl,
     decode_struct::DecodeStruct,
+    decompress_trait::DecompressTrait,
     decompression::{
         multi::error::MultiDecompressErrorReason, state::decompression_runner,
     },
-    dtraits::DecompressTrait,
 };
 
 pub enum DecodeState<'a, T> {