fix: ids are strings

russe/Cargo.toml

@@ -26,16 +26,23 @@ futures-util = "0.3.18"
 memchr = "2"
 mime = { version = "0.3.17", optional = true }
 reqwest-0_12 = { package = "reqwest", version = "0.12", optional = true, features = ["stream"] }
-tokio = "1"
+tokio = { version = "1", features = ["sync"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 tracing = "0.1.30"
 
 [dev-dependencies]
 futures-test = "0.3"
+eyre = "0.6"
+color-eyre = "0.6"
 indoc = "2"
 tokio = { version = "1.28.2", features = ["macros"] }
 tokio-test = "0.4"
+tokio-stream = "0.1"
 tokio-util = { version = "0.7", features = ["codec", "io", "rt"] }
 
+[[examples]]
+name = "manager"
+required-features = ["reqwest-0_12"]
+
 [lints]
 workspace = true

russe/examples/manager.rs

@@ -0,0 +1,37 @@
+//! Demonstrates usage of the SSE connection manager.
+
+extern crate reqwest_0_12 as reqwest;
+
+use futures_util::StreamExt as _;
+use reqwest::{Method, Request};
+use russe::reqwest_0_12::Manager;
+use tokio_stream::wrappers::UnboundedReceiverStream;
+
+#[tokio::main(flavor = "current_thread")]
+async fn main() -> eyre::Result<()> {
+    color_eyre::install()?;
+
+    let client = reqwest::Client::default();
+
+    let mut req = Request::new(Method::GET, "https://sse.dev/test".parse().unwrap());
+    let headers = req.headers_mut();
+    headers.insert("accept", russe::MEDIA_TYPE_STR.parse().unwrap());
+
+    let mut manager = Manager::new(&client, req);
+
+    let (_task_handle, events) = manager.send().await.unwrap();
+
+    let mut event_stream = UnboundedReceiverStream::new(events);
+
+    while let Some(Ok(ev)) = event_stream.next().await {
+        println!("{ev:?}");
+
+        if let russe::Event::Message(msg) = ev {
+            if let Some(id) = msg.id {
+                manager.commit_id(id);
+            }
+        }
+    }
+
+    Ok(())
+}

russe/src/decoder.rs

@@ -100,7 +100,7 @@ impl tokio_util::codec::Decoder for Decoder {
 
                 // id
                 2 | 3 => {
-                    message.id = Some(input.parse().expect("ID should be an integer"));
+                    message.id = Some(input.to_owned());
                     message_event = true;
                 }
 
@@ -170,7 +170,7 @@ mod tests {
 
             retry: 999
             data: msg5 specifies new retry
-            id: 43
+            id: 43a
 
             event: msg
             data: msg6 is named
@@ -215,7 +215,7 @@ mod tests {
         assert_eq!(
             Event::Message(Message {
                 data: "msg4 with an ID".into(),
-                id: Some(42),
+                id: Some("42".to_owned()),
                 ..Default::default()
             }),
             ev,
@@ -225,7 +225,7 @@ mod tests {
         assert_eq!(
             Event::Message(Message {
                 data: "msg5 specifies new retry".into(),
-                id: Some(43),
+                id: Some("43a".to_owned()),
                 retry: Some(Duration::from_millis(999)),
                 event: None,
             }),

russe/src/message.rs

@@ -17,9 +17,9 @@ pub struct Message {
     /// Event identifier.
     ///
     /// Used in Last-Event-ID header.
-    // TODO: not always a number
-    // see https://github.com/whatwg/html/issues/7363
-    pub id: Option<u64>,
+    ///
+    /// See <https://github.com/whatwg/html/issues/7363>.
+    pub id: Option<String>,
 }
 
 #[cfg(test)]