Add event_ids to events

Signed-off-by: trivernis <trivernis@protonmail.com>

Cargo.toml

@@ -14,6 +14,7 @@ description = "IPC using Rust MessagePack (rmp)"
 thiserror = "1.0.24"
 rmp-serde = "0.15.4"
 log = "0.4.14"
+lazy_static = "1.4.0"
 
 [dependencies.serde]
 version = "1.0.125"

src/events/event.rs

@@ -1,4 +1,5 @@
 use crate::error::Result;
+use crate::events::generate_event_id;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncRead, AsyncReadExt};
@@ -8,14 +9,21 @@ use tokio::io::{AsyncRead, AsyncReadExt};
 /// as raw binary data.
 #[derive(Serialize, Deserialize)]
 pub struct Event {
+    id: u64,
+    ref_id: Option<u64>,
     name: String,
     data: Vec<u8>,
 }
 
 impl Event {
     /// Creates a new event
-    pub fn new(name: String, data: Vec<u8>) -> Self {
+    pub fn new(name: String, data: Vec<u8>, ref_id: Option<u64>) -> Self {
-        Self { name, data }
+        Self {
+            id: generate_event_id(),
+            ref_id,
+            name,
+            data,
+        }
     }
 
     /// Decodes the data to the given type

src/events/mod.rs

@@ -1,3 +1,19 @@
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::Arc;
+use std::time::{SystemTime, UNIX_EPOCH};
+
 pub mod error_event;
 pub mod event;
 pub mod event_handler;
+
+/// Generates a new event id
+pub(crate) fn generate_event_id() -> u64 {
+    lazy_static::lazy_static! {
+        static ref COUNTER: Arc<AtomicU64> = Arc::new(AtomicU64::new(0));
+    }
+    let epoch_elapsed = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+
+    (epoch_elapsed.as_secs() % u16::MAX as u64) << 48
+        | (epoch_elapsed.subsec_millis() as u64) << 32
+        | COUNTER.fetch_add(1, Ordering::SeqCst)
+}

src/ipc/stream_emitter.rs

@@ -21,10 +21,14 @@ impl StreamEmitter {
         }
     }
 
-    /// Emits an event
+    pub async fn _emit<T: Serialize>(
-    pub async fn emit<T: Serialize>(&self, event: &str, data: T) -> Result<()> {
+        &self,
+        event: &str,
+        data: T,
+        res_id: Option<u64>,
+    ) -> Result<()> {
         let data_bytes = rmp_serde::to_vec(&data)?;
-        let event = Event::new(event.to_string(), data_bytes);
+        let event = Event::new(event.to_string(), data_bytes, res_id);
         let event_bytes = event.to_bytes()?;
         {
             let mut stream = self.stream.lock().await;
@@ -33,4 +37,23 @@ impl StreamEmitter {
 
         Ok(())
     }
+
+    /// Emits an event
+    pub async fn emit<T: Serialize>(&self, event: &str, data: T) -> Result<()> {
+        self._emit(event, data, None).await?;
+
+        Ok(())
+    }
+
+    /// Emits a response to an event
+    pub async fn emit_response<T: Serialize>(
+        &self,
+        event_id: u64,
+        event: &str,
+        data: T,
+    ) -> Result<()> {
+        self._emit(event, data, Some(event_id)).await?;
+
+        Ok(())
+    }
 }

src/tests/event_tests.rs

@@ -0,0 +1,12 @@
+use crate::events::generate_event_id;
+use std::collections::HashSet;
+
+#[test]
+fn event_ids_work() {
+    let mut ids = HashSet::new();
+
+    // simple collision test
+    for _ in 0..100000 {
+        assert!(ids.insert(generate_event_id()))
+    }
+}

src/tests/mod.rs

@@ -1,2 +1,3 @@
 mod ipc_tests;
 mod utils;
+mod event_tests;