Propagate explicit empty event ID to ReconnectingRequest. (#28)

Previously, the ReconnectingRequest object only cached event IDs that were Some, which was determined
by fetching an event from the parser, and then checking the id (empty = None, not empty = Some).

This logic is incorrect. ReconnectingRequest should always propagate the last known explicit event ID, which could
in fact be an empty string.

Author: cwaldren-ld

Makefile

@@ -1,5 +1,5 @@
 TEMP_TEST_OUTPUT=/tmp/contract-test-service.log
-SKIPFLAGS = -skip 'reconnection' -skip 'HTTP behavior/client follows 301 redirect' -skip 'HTTP behavior/client follows 307 redirect'
+SKIPFLAGS = -skip 'HTTP behavior/client follows 301 redirect' -skip 'HTTP behavior/client follows 307 redirect'
 
 
 build-contract-tests:

eventsource-client/src/client.rs

@@ -306,11 +306,13 @@ impl<C> ReconnectingRequest<C> {
             request_builder = request_builder.header(name, value);
         }
 
-        if self.last_event_id.is_some() {
-            let id_as_header = HeaderValue::from_str(self.last_event_id.as_ref().unwrap())
-                .map_err(|e| Error::InvalidParameter(Box::new(e)))?;
+        if let Some(id) = self.last_event_id.as_ref() {
+            if !id.is_empty() {
+                let id_as_header =
+                    HeaderValue::from_str(id).map_err(|e| Error::InvalidParameter(Box::new(e)))?;
 
-            request_builder = request_builder.header("last-event-id", id_as_header);
+                request_builder = request_builder.header("last-event-id", id_as_header);
+            }
         }
 
         let body = match &self.props.body {
@@ -357,9 +359,7 @@ where
             if let Some(event) = this.event_parser.get_event() {
                 return match event {
                     SSE::Event(ref evt) => {
-                        if evt.id.is_some() {
-                            *this.last_event_id = evt.id.clone();
-                        }
+                        *this.last_event_id = evt.id.clone();
 
                         if let Some(retry) = evt.retry {
                             this.props.reconnect_opts.delay = Duration::from_millis(retry);

eventsource-client/src/event_parser.rs

@@ -11,7 +11,7 @@ struct EventData {
     pub event_type: String,
     pub data: String,
     pub comment: Option<String>,
-    pub id: String,
+    pub id: Option<String>,
     pub retry: Option<u64>,
 }
 
@@ -25,7 +25,7 @@ impl EventData {
         self.data.push('\n');
     }
 
-    pub fn with_id(mut self, value: String) -> Self {
+    pub fn with_id(mut self, value: Option<String>) -> Self {
         self.id = value;
         self
     }
@@ -62,11 +62,7 @@ impl TryFrom<EventData> for Option<SSE> {
         let mut data = event_data.data.clone();
         data.truncate(data.len() - 1);
 
-        let id = if event_data.id.is_empty() {
-            None
-        } else {
-            Some(event_data.id.clone())
-        };
+        let id = event_data.id.clone();
 
         let retry = event_data.retry;
 
@@ -151,7 +147,7 @@ pub struct EventParser {
     /// the event data currently being decoded
     event_data: Option<EventData>,
     /// the last-seen event ID; events without an ID will take on this value until it is updated.
-    last_event_id: String,
+    last_event_id: Option<String>,
     sse: VecDeque<SSE>,
 }
 
@@ -162,7 +158,7 @@ impl EventParser {
             incomplete_line: None,
             last_char_was_cr: false,
             event_data: None,
-            last_event_id: String::new(),
+            last_event_id: None,
             sse: VecDeque::with_capacity(3),
         }
     }
@@ -234,8 +230,13 @@ impl EventParser {
                             continue;
                         }
 
-                        self.last_event_id = value.to_string();
-                        event_data.id = self.last_event_id.clone();
+                        if value.is_empty() {
+                            self.last_event_id = Some("".to_string());
+                        } else {
+                            self.last_event_id = Some(value.to_string());
+                        }
+
+                        event_data.id = self.last_event_id.clone()
                     } else if key == "retry" {
                         match value.parse::<u64>() {
                             Ok(retry) => {