Feature/wasm pack

Cargo.toml

@@ -28,15 +28,19 @@ bindgen = "0.69.4"
 [features]
 std = []
 plaintext-before-extension = []
+serde_support = ["serde", "std", "arrayvec/serde"]
 
 [profile.release]
 opt-level = 'z'   # Optimize for size
 lto = true        # Enable Link Time Optimization
 codegen-units = 1 # Reduce codegen units to improve optimizations
 
 [dependencies]
+serde = { version = "1.0", features = ["derive"], optional = true }
 bitflags = "2.4.2"
-arrayvec = "0.7.4"
+arrayvec = { version = "0.7.4", features = [
+    "serde",
+], optional = true, default-features = false }
 
 [workspace]
-members = ["cli"]
+members = ["cli", "wasm"]

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "m-bus-parser-cli"
-version = "0.0.4"
+version = "0.0.3"
 edition = "2021"
 description = "A cli to use the library for parsing M-Bus frames"
 license = "MIT"

src/frames/mod.rs

@@ -1,6 +1,9 @@
 //! is part of the MBUS data link layer
 //! It is used to encapsulate the application layer data
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub enum Frame<'a> {
     SingleCharacter {
@@ -22,6 +25,10 @@ pub enum Frame<'a> {
     },
 }
 
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub enum Function {
     SndNk,
@@ -63,7 +70,10 @@ impl TryFrom<u8> for Function {
         }
     }
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub enum Address {
     Uninitalized,

src/lib.rs

@@ -58,9 +58,16 @@ pub mod frames;
 pub mod user_data;
 
 #[derive(Debug)]
+#[cfg_attr(feature = "serde_support", derive(serde::Serialize))]
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Deserialize),
+    serde(bound(deserialize = "'de: 'a"))
+)]
 pub struct MbusData<'a> {
     pub frame: frames::Frame<'a>,
     pub user_data: Option<user_data::UserDataBlock<'a>>,
+    pub data_records: Option<user_data::DataRecords>,
 }
 
 #[derive(Debug)]
@@ -77,9 +84,7 @@ impl From<FrameError> for MbusError {
 
 impl From<ApplicationLayerError> for MbusError {
     fn from(error: ApplicationLayerError) -> MbusError {
-        match error {
-            _ => MbusError::ApplicationLayerError(error),
-        }
+        MbusError::ApplicationLayerError(error)
     }
 }
 
@@ -88,15 +93,30 @@ impl<'a> TryFrom<&'a [u8]> for MbusData<'a> {
 
     fn try_from(data: &'a [u8]) -> Result<Self, Self::Error> {
         let frame = frames::Frame::try_from(data)?;
-
-        let user_data = match &frame {
+        let mut user_data = None;
+        let mut data_records = None;
+        match &frame {
             frames::Frame::LongFrame { data, .. } => {
-                Some(user_data::UserDataBlock::try_from(*data)?)
+                if let Ok(x) = user_data::UserDataBlock::try_from(*data) {
+                    user_data = Some(x);
+                    if let Ok(user_data::UserDataBlock::VariableDataStructure {
+                        fixed_data_header: _,
+                        variable_data_block,
+                    }) = user_data::UserDataBlock::try_from(*data)
+                    {
+                        data_records = user_data::DataRecords::try_from(variable_data_block).ok();
+                    }
+                }
             }
-            frames::Frame::SingleCharacter { .. } => None,
-            frames::Frame::ShortFrame { .. } | frames::Frame::ControlFrame { .. } => None,
+            frames::Frame::SingleCharacter { .. } => (),
+            frames::Frame::ShortFrame { .. } => (),
+            frames::Frame::ControlFrame { .. } => (),
         };
 
-        Ok(MbusData { frame, user_data })
+        Ok(MbusData {
+            frame,
+            user_data,
+            data_records,
+        })
     }
 }

src/user_data/data_information.rs

@@ -3,9 +3,14 @@ use super::variable_user_data::DataRecordError;
 use arrayvec::ArrayVec;
 
 const MAX_DIFE_RECORDS: usize = 10;
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub struct DataInformationBlock {
     pub data_information_field: DataInformationField,
+    #[serde(skip_serializing, skip_deserializing)]
     pub data_information_field_extension:
         Option<ArrayVec<DataInformationFieldExtension, MAX_DIFE_RECORDS>>,
 }
@@ -19,7 +24,10 @@ impl DataInformationBlock {
         size
     }
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub struct DataInformationField {
     pub data: u8,
@@ -42,7 +50,10 @@ impl From<u8> for DataInformationFieldExtension {
         DataInformationFieldExtension { data }
     }
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub struct DataInformationFieldExtension {
     pub data: u8,
@@ -94,7 +105,10 @@ impl DataInformationFieldExtension {
         self.data & 0x80 != 0
     }
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, Clone, PartialEq)]
 pub struct DataInformation {
     pub storage_number: u64,
@@ -116,7 +130,10 @@ impl std::fmt::Display for DataInformation {
 }
 
 const MAXIMUM_DATA_INFORMATION_SIZE: usize = 11;
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, Clone, PartialEq)]
 pub struct DataInformationExtensionField {}
 
@@ -205,11 +222,19 @@ impl TryFrom<&DataInformationBlock> for DataInformation {
     }
 }
 
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub enum DataType {
     Text(ArrayVec<u8, 18>),
     Number(f64),
 }
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(PartialEq, Debug)]
 pub struct Data {
     value: Option<DataType>,
@@ -509,7 +534,10 @@ impl DataInformation {
         self.size
     }
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum FunctionField {
     InstantaneousValue,
@@ -529,7 +557,10 @@ impl std::fmt::Display for FunctionField {
         }
     }
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum SpecialFunctions {
     ManufacturerSpecific,
@@ -655,7 +686,10 @@ impl DataFieldCoding {
         }
     }
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum DataFieldCoding {
     NoData,

src/user_data/data_record.rs

@@ -3,19 +3,28 @@ use super::{
     value_information::{ValueInformation, ValueInformationBlock},
     variable_user_data::DataRecordError,
 };
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub struct RawDataRecordHeader {
     pub data_information_block: DataInformationBlock,
     pub value_information_block: ValueInformationBlock,
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub struct ProcessedDataRecordHeader {
     pub data_information: DataInformation,
     pub value_information: ValueInformation,
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub struct DataRecord {
     pub data_record_header: DataRecordHeader,
@@ -27,7 +36,10 @@ impl DataRecord {
         self.data_record_header.get_size() + self.data.get_size()
     }
 }
-
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize)
+)]
 #[derive(Debug, PartialEq)]
 pub struct DataRecordHeader {
     pub raw_data_record_header: RawDataRecordHeader,