Move SSE parsing logic into event_parser.rs (#19)

* Move parsing logic into event_parser.rs
* Fix a couple Clippy lints related to Rust 2018
* Add InvalidParameter error, and update client.rs to use it instead of HttpRequest errors

Author: cwaldren-ld

Makefile

@@ -1,5 +1,5 @@
 TEMP_TEST_OUTPUT=/tmp/contract-test-service.log
-SKIPFLAGS = -skip 'linefeeds' -skip 'basic parsing' -skip 'HTTP behavior' -skip 'reconnection'
+SKIPFLAGS = -skip 'basic parsing' -skip 'HTTP behavior' -skip 'reconnection'
 
 build-contract-tests:
 	@cargo build

contract-tests/src/bin/sse-test-api/main.rs

@@ -35,21 +35,25 @@ struct Config {
 }
 
 #[derive(Serialize, Debug)]
-#[serde(tag = "kind")]
+#[serde(tag = "kind", rename_all = "camelCase")]
 enum EventType {
-    #[serde(rename = "event")]
     Event { event: Event },
-    #[serde(rename = "error")]
+    Comment { comment: String },
     Error { error: String },
 }
 
-impl From<es::Event> for EventType {
-    fn from(event: es::Event) -> Self {
-        Self::Event {
-            event: Event {
-                event_type: event.event_type.clone(),
-                data: String::from_utf8(event.field("data").unwrap_or_default().to_vec()).unwrap(),
-                id: String::from_utf8(event.field("id").unwrap_or_default().to_vec()).unwrap(),
+impl From<es::SSE> for EventType {
+    fn from(event: es::SSE) -> Self {
+        match event {
+            es::SSE::Event(evt) => Self::Event {
+                event: Event {
+                    event_type: evt.event_type,
+                    data: String::from_utf8(evt.data.to_vec()).unwrap(),
+                    id: String::from_utf8(evt.id.to_vec()).unwrap(),
+                },
+            },
+            es::SSE::Comment(comment) => Self::Comment {
+                comment: String::from_utf8(comment).unwrap(),
             },
         }
     }

eventsource-client/Cargo.toml

@@ -26,6 +26,7 @@ env_logger = "0.7.1"
 maplit = "1.0.1"
 simplelog = "0.5.3"
 tokio = { version = "1.2.0", features = ["macros", "rt-multi-thread"] }
+test-case = "1.2.3"
 
 [features]
 default = ["rustls"]

eventsource-client/examples/tail.rs

@@ -40,12 +40,20 @@ async fn main() -> Result<(), es::Error> {
 fn tail_events(client: impl Client) -> impl Stream<Item = Result<(), ()>> {
     client
         .stream()
-        .map_ok(|event| {
-            println!(
-                "got an event: {}\n{}",
-                event.event_type,
-                from_utf8(event.field("data").unwrap_or_default()).unwrap_or_default()
-            )
+        .map_ok(|event| match event {
+            es::SSE::Event(ev) => {
+                println!(
+                    "got an event: {}\n{}",
+                    ev.event_type,
+                    from_utf8(&ev.data).unwrap_or_default()
+                )
+            }
+            es::SSE::Comment(comment) => {
+                println!(
+                    "got a comment: \n{}",
+                    from_utf8(&comment).unwrap_or_default()
+                )
+            }
         })
         .map_err(|err| eprintln!("error streaming events: {:?}", err))
 }