Add event names + custom serde, use new camloc API

client/src/transports/tcp.rs

@@ -146,7 +146,7 @@ impl Subscribable for Tcp {
                 true,
             ),
         );
-        self.inner.events.lock().unwrap().insert(ev, id);
+        self.inner.events.lock().unwrap().insert(ev.clone(), id);
 
         self.cmd_id(cmd::Subscribe(ev), id)?;
 
@@ -155,7 +155,7 @@ impl Subscribable for Tcp {
 
     fn unsubscribe<E: roblib::event::Event>(&self, ev: E) -> Result<()> {
         let ev = ev.into();
-        let cmd = cmd::Unsubscribe(ev);
+        let cmd = cmd::Unsubscribe(ev.clone());
 
         let mut lock = self.inner.events.lock().unwrap();
         match lock.entry(ev) {

client/src/transports/udp.rs

@@ -138,7 +138,7 @@ impl Subscribable for Udp {
 
     fn unsubscribe<E: roblib::event::Event>(&self, ev: E) -> Result<()> {
         let ev = ev.into();
-        let cmd: cmd::Concrete = cmd::Unsubscribe(ev).into();
+        let cmd: cmd::Concrete = cmd::Unsubscribe(ev.clone()).into();
 
         self.sock
             .send(&bincode::Options::serialize(bincode::options(), &cmd)?)?;

client/src/transports/ws.rs

@@ -143,7 +143,7 @@ impl SubscribableAsync for Ws {
 
         let (tx, mut worker_rx) = mpsc::channel(1);
         self.inner.handlers.lock().await.insert(id, tx);
-        self.inner.events.lock().await.insert(ev, id);
+        self.inner.events.lock().await.insert(ev.clone(), id);
         self.send(id, cmd::Subscribe(ev)).await?;
 
         let (client_tx, client_rx) = broadcast::channel(128);
@@ -167,7 +167,7 @@ impl SubscribableAsync for Ws {
         let ev = ev.into();
 
         let mut lock = self.inner.events.lock().await;
-        match lock.entry(ev) {
+        match lock.entry(ev.clone()) {
             std::collections::hash_map::Entry::Occupied(v) => {
                 let id = v.remove();
                 self.send(id, cmd::Unsubscribe(ev)).await?;

roblib/src/camloc/event.rs

@@ -1,4 +1,3 @@
-pub use camloc_server::service::Subscriber;
 use camloc_server::{PlacedCamera, Position};
 use roblib_macro::Event;
 use serde::{Deserialize, Serialize};
@@ -7,23 +6,27 @@ use std::net::SocketAddr;
 #[derive(Event, Serialize, Deserialize, PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub struct CamlocConnect;
 impl crate::event::Event for CamlocConnect {
+    const NAME: &'static str = "camloc_connect";
     type Item = (SocketAddr, PlacedCamera);
 }
 
 #[derive(Event, Serialize, Deserialize, PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub struct CamlocDisconnect;
 impl crate::event::Event for CamlocDisconnect {
+    const NAME: &'static str = "camloc_disconnect";
     type Item = SocketAddr;
 }
 
 #[derive(Event, Serialize, Deserialize, PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub struct CamlocPosition;
 impl crate::event::Event for CamlocPosition {
+    const NAME: &'static str = "position";
     type Item = Position;
 }
 
 #[derive(Event, Serialize, Deserialize, PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub struct CamlocInfoUpdate;
 impl crate::event::Event for CamlocInfoUpdate {
+    const NAME: &'static str = "camloc_info_update";
     type Item = (SocketAddr, PlacedCamera);
 }

roblib/src/camloc/mod.rs

@@ -1,11 +1,7 @@
 pub mod cmd;
 pub mod event;
 
-pub mod server {
-    pub use camloc_server::*;
-}
-
-pub use camloc_server::{MotionHint, Position, MAIN_PORT};
+pub use camloc_server::{service, MotionHint, Position};
 
 pub trait Camloc {
     fn get_position(&self) -> anyhow::Result<Option<Position>>;