feat: escape json

Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 [dependencies]
 clap = { version = "4.5.17", features = ["derive"] }
 hex = "0.4"
+serde_json = "1.0.128"
 thiserror = "1.0.64"
 
 [dev-dependencies]

project-words.txt

@@ -13,6 +13,7 @@ fooe
 fooi
 llee
 llleee
+ñandú
 spame
 spamee
 tempdir

src/parsers/mod.rs

@@ -411,10 +411,31 @@ mod tests {
             assert_eq!(to_json(b"1:9"), r#""9""#.to_string());
         }
 
-        /* todo:
-           - String containing special chars like : `"`, `\`, '\\'
-           - String containing JSON
-        */
+        mod should_escape_json {
+            use crate::parsers::tests::{to_bencode, to_json};
+
+            #[test]
+            fn containing_a_double_quote() {
+                assert_eq!(to_json("1:\"".as_bytes()), r#""\"""#.to_string());
+            }
+
+            #[test]
+            fn containing_backslashes() {
+                assert_eq!(to_json("1:\\".as_bytes()), r#""\\""#.to_string());
+            }
+
+            #[test]
+            fn containing_control_characters() {
+                assert_eq!(to_json("1:\n".as_bytes()), r#""\n""#.to_string());
+                assert_eq!(to_json("1:\r".as_bytes()), r#""\r""#.to_string());
+                assert_eq!(to_json("1:\t".as_bytes()), r#""\t""#.to_string());
+            }
+
+            #[test]
+            fn containing_unicode_characters() {
+                assert_eq!(to_json(&to_bencode("ñandú")), r#""ñandú""#.to_string());
+            }
+        }
 
         mod it_should_fail_parsing_when {
             use crate::parsers::{error::Error, tests::parse};
@@ -735,6 +756,12 @@ mod tests {
         output
     }
 
+    /// Helper to convert a string into a bencoded string.
+    fn to_bencode(value: &str) -> Vec<u8> {
+        let bencoded_str = format!("{}:{}", value.len(), value);
+        bencoded_str.as_bytes().to_vec()
+    }
+
     /// Wrapper to easily use the parser in tests
     fn parse(input_buffer: &[u8]) -> Result<String, error::Error> {
         let mut output = String::new();

src/parsers/string.rs

@@ -75,11 +75,10 @@ impl StringParser {
         self.parsed_value.clone()
     }
 
-    /// It adds the double quotes to the string it's the JSON delimiter for
-    /// string values.
+    /// It serializes the parsed value into JSON.
     #[must_use]
     fn json(&self) -> String {
-        format!("\"{}\"", self.parsed_value())
+        serde_json::to_string(&self.parsed_value()).unwrap()
     }
 }
 
@@ -184,11 +183,7 @@ impl Value {
 
     fn parse<R: Read>(&mut self, reader: &mut ByteReader<R>) -> Result<(), Error> {
         for _i in 1..=self.length {
-            let byte = Self::next_byte(reader)?;
-
-            self.add_byte(byte);
-
-            // todo: escape '"' and '\\' with '\\';
+            self.add_byte(Self::next_byte(reader)?);
         }
 
         Ok(())