fix(types): conform JSON-RPC parsing to spec by properly trimming whitespace and newlines

src/types/batch.rs

@@ -60,10 +60,9 @@ impl TryFrom<Bytes> for InboundData {
         }
         debug!("Parsing inbound data");
 
-        // Special-case a single request, rejecting invalid JSON.
-        if bytes.starts_with(b"{") {
-            let rv: &RawValue = serde_json::from_slice(bytes.as_ref())?;
-
+        // First, check if it's a single request
+        let rv: &RawValue = serde_json::from_slice(bytes.as_ref())?;
+        if rv.get().starts_with("{") {
             let range = find_range!(bytes, rv.get());
 
             return Ok(Self {
@@ -74,7 +73,7 @@ impl TryFrom<Bytes> for InboundData {
         }
 
         // Otherwise, parse the batch
-        let DeserHelper(reqs) = serde_json::from_slice(bytes.as_ref())?;
+        let DeserHelper(reqs) = serde_json::from_str(rv.get())?;
         let reqs = reqs
             .into_iter()
             .map(|raw| find_range!(bytes, raw.get()))
@@ -90,3 +89,48 @@ impl TryFrom<Bytes> for InboundData {
 
 #[derive(Debug, Deserialize)]
 struct DeserHelper<'a>(#[serde(borrow)] Vec<&'a RawValue>);
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_deser_batch() {
+        let batch = r#"[
+            {"id": 1, "method": "foo", "params": [1, 2, 3]},
+            {"id": 2, "method": "bar", "params": [4, 5, 6]}
+        ]"#;
+
+        let bytes = Bytes::from(batch);
+        let batch = InboundData::try_from(bytes).unwrap();
+
+        assert_eq!(batch.len(), 2);
+        assert!(!batch.single());
+    }
+
+    #[test]
+    fn test_deser_single() {
+        let single = r#"{"id": 1, "method": "foo", "params": [1, 2, 3]}"#;
+
+        let bytes = Bytes::from(single);
+        let batch = InboundData::try_from(bytes).unwrap();
+
+        assert_eq!(batch.len(), 1);
+        assert!(batch.single());
+    }
+
+    #[test]
+    fn test_deser_single_with_whitespace() {
+        let single = r#" 
+
+        {"id": 1, "method": "foo", "params": [1, 2, 3]}   
+
+                "#;
+
+        let bytes = Bytes::from(single);
+        let batch = InboundData::try_from(bytes).unwrap();
+
+        assert_eq!(batch.len(), 1);
+        assert!(batch.single());
+    }
+}

src/types/req.rs

@@ -192,6 +192,7 @@ impl Request {
 
 #[cfg(test)]
 mod test {
+
     use crate::types::METHOD_LEN_LIMIT;
 
     use super::*;
@@ -236,4 +237,28 @@ mod test {
 
         assert_eq!(size, METHOD_LEN_LIMIT + 1);
     }
+
+    #[test]
+    fn test_with_linebreak() {
+        let bytes = Bytes::from_static(
+            r#"
+
+   { "id": 1,
+    "jsonrpc": "2.0",
+    "method": "eth_getBalance",
+    "params": ["0x4444d38c385d0969C64c4C8f996D7536d16c28B9", "latest"]
+  }
+
+        "#
+            .as_bytes(),
+        );
+        let req = Request::try_from(bytes).unwrap();
+
+        assert_eq!(req.id(), Some("1"));
+        assert_eq!(req.method(), r#"eth_getBalance"#);
+        assert_eq!(
+            req.params(),
+            r#"["0x4444d38c385d0969C64c4C8f996D7536d16c28B9", "latest"]"#
+        );
+    }
 }