1.2.6 use Result Error handling + send the deserializing error as the…

… function return

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "h1emu-core"
-version = "1.2.5"
+version = "1.2.6"
 edition = "2021"
 description = "Utility library used in h1emu."
 license = "BSD-3-Clause"

src/gatewayprotocol.rs

@@ -4,7 +4,6 @@ use wasm_bindgen::prelude::*;
 
 use super::gatewayprotocol_packets_structs::*;
 use super::lib_utils::read_prefixed_string_le;
-use super::protocol_errors::gen_deserializing_error_json;
 
 #[wasm_bindgen]
 pub enum GatewayChannels {
@@ -63,14 +62,10 @@ impl GatewayProtocol {
             ticket,
             client_protocol,
             client_build,
-            error: None,
         })
     }
     pub fn pack_login_reply_packet(&mut self, logged_in: bool) -> Vec<u8> {
-        self.pack_login_reply_object(LoginReplyPacket {
-            logged_in,
-            error: None,
-        })
+        self.pack_login_reply_object(LoginReplyPacket { logged_in })
     }
     pub fn pack_tunnel_data_packet_for_client(&mut self, data: Vec<u8>, channel: u8) -> Vec<u8> {
         self._pack_tunnel_data_packet(0x05, data, channel)
@@ -154,9 +149,6 @@ impl GatewayProtocol {
     }
 
     pub fn pack_login_request_object(&mut self, packet: LoginRequestPacket) -> Vec<u8> {
-        if packet.error.is_some() {
-            return gen_deserializing_error_json();
-        }
         self.wtr.clear();
         self.wtr.write_u8(0x01).unwrap_or_default();
         self.wtr

src/gatewayprotocol_packets_structs.rs

@@ -5,22 +5,16 @@ pub struct LoginRequestPacket {
     pub ticket: String,
     pub client_protocol: String,
     pub client_build: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<bool>, // used internnaly to identify deserialization errors
 }
 
 #[derive(Serialize, Deserialize, Clone)]
 pub struct LoginReplyPacket {
     pub logged_in: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<bool>, // used internnaly to identify deserialization errors
 }
 
 #[derive(Serialize, Deserialize)]
 pub struct ChannelIsRoutablePacket {
     pub is_routable: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<bool>, // used internnaly to identify deserialization errors
 }
 
 #[derive(Serialize)]

src/protocol_errors.rs

@@ -1,5 +1,7 @@
 use std::io::Cursor;
 
+use wasm_bindgen::prelude::wasm_bindgen;
+
 pub fn gen_size_error_json(rdr: Cursor<&std::vec::Vec<u8>>) -> String {
     format!(
         r#"{{"name":"Error","error":"size","size":{},"raw":{:?}}}"#,
@@ -29,12 +31,15 @@ pub fn gen_corruption_error_json(
     )
 }
 
-pub fn gen_deserializing_error_json() -> Vec<u8> {
-    vec![] // maybe encoding a null string with error log would be better
-           /* return json!({
-               "name": "Error",
-               "error": "deserializing",
-               "raw": packet
-           })
-           .to_string();*/
+#[wasm_bindgen]
+pub enum ErrorType {
+    Deserializing = 0x99,
+}
+
+pub fn gen_deserializing_error_json(error: serde_json::Error) -> Vec<u8> {
+    let error_string = format!("{}", error);
+    // create a vec starting with the error type and then the error stringify
+    let mut error_vec: Vec<u8> = vec![0x00, ErrorType::Deserializing as u8];
+    error_vec.append(&mut error_string.as_bytes().to_vec());
+    error_vec
 }