feat(socketio): async adapter (#395)

Author: Totodore

.github/workflows/github-ci.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 jobs:
   format:

crates/engineioxide/Readme.md

@@ -53,10 +53,10 @@ impl EngineIoHandler for MyHandler {
         let cnt = self.user_cnt.fetch_sub(1, Ordering::Relaxed) - 1;
         socket.emit(cnt.to_string()).ok();
     }
-    fn on_message(&self, msg: Str, socket: Arc<Socket<SocketState>>) {
+    fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<SocketState>>) {
         *socket.data.id.lock().unwrap() = msg.into(); // bind a provided user id to a socket
     }
-    fn on_binary(&self, data: Bytes, socket: Arc<Socket<SocketState>>) { }
+    fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<SocketState>>) { }
 }
 
 // Create a new engineio layer

crates/engineioxide/src/config.rs

@@ -15,8 +15,8 @@
 //!     type Data = ();
 //!     fn on_connect(self: Arc<Self>, socket: Arc<Socket<()>>) { }
 //!     fn on_disconnect(&self, socket: Arc<Socket<()>>, reason: DisconnectReason) { }
-//!     fn on_message(&self, msg: Str, socket: Arc<Socket<()>>) { }
-//!     fn on_binary(&self, data: Bytes, socket: Arc<Socket<()>>) { }
+//!     fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<()>>) { }
+//!     fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<()>>) { }
 //! }
 //!
 //! let config = EngineIoConfig::builder()
@@ -150,12 +150,12 @@ impl EngineIoConfigBuilder {
     ///         println!("socket disconnect {}", socket.id);
     ///     }
     ///
-    ///     fn on_message(&self, msg: Str, socket: Arc<Socket<()>>) {
+    ///     fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<()>>) {
     ///         println!("Ping pong message {:?}", msg);
     ///         socket.emit(msg).unwrap();
     ///     }
     ///
-    ///     fn on_binary(&self, data: Bytes, socket: Arc<Socket<()>>) {
+    ///     fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<()>>) {
     ///         println!("Ping pong binary message {:?}", data);
     ///         socket.emit_binary(data).unwrap();
     ///     }

crates/engineioxide/src/engine.rs

@@ -115,12 +115,12 @@ mod tests {
             println!("socket disconnect {} {:?}", socket.id, reason);
         }
 
-        fn on_message(&self, msg: Str, socket: Arc<Socket<Self::Data>>) {
+        fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<Self::Data>>) {
             println!("Ping pong message {:?}", msg);
             socket.emit(msg).ok();
         }
 
-        fn on_binary(&self, data: Bytes, socket: Arc<Socket<Self::Data>>) {
+        fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<Self::Data>>) {
             println!("Ping pong binary message {:?}", data);
             socket.emit_binary(data).ok();
         }

crates/engineioxide/src/handler.rs

@@ -30,10 +30,10 @@
 //!         let cnt = self.user_cnt.fetch_sub(1, Ordering::Relaxed) - 1;
 //!         socket.emit(cnt.to_string()).ok();
 //!     }
-//!     fn on_message(&self, msg: Str, socket: Arc<Socket<SocketState>>) {
+//!     fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<SocketState>>) {
 //!         *socket.data.id.lock().unwrap() = msg.into(); // bind a provided user id to a socket
 //!     }
-//!     fn on_binary(&self, data: Bytes, socket: Arc<Socket<SocketState>>) { }
+//!     fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<SocketState>>) { }
 //! }
 //!
 //! // Create an engine io service with the given handler
@@ -60,8 +60,8 @@ pub trait EngineIoHandler: std::fmt::Debug + Send + Sync + 'static {
     fn on_disconnect(&self, socket: Arc<Socket<Self::Data>>, reason: DisconnectReason);
 
     /// Called when a message is received from the client.
-    fn on_message(&self, msg: Str, socket: Arc<Socket<Self::Data>>);
+    fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<Self::Data>>);
 
     /// Called when a binary message is received from the client.
-    fn on_binary(&self, data: Bytes, socket: Arc<Socket<Self::Data>>);
+    fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<Self::Data>>);
 }

crates/engineioxide/src/layer.rs

@@ -15,8 +15,8 @@
 //!     type Data = ();
 //!     fn on_connect(self: Arc<Self>, socket: Arc<Socket<()>>) { }
 //!     fn on_disconnect(&self, socket: Arc<Socket<()>>, reason: DisconnectReason) { }
-//!     fn on_message(&self, msg: Str, socket: Arc<Socket<()>>) { }
-//!     fn on_binary(&self, data: Bytes, socket: Arc<Socket<()>>) { }
+//!     fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<()>>) { }
+//!     fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<()>>) { }
 //! }
 //! // Create a new engineio layer
 //! let layer = EngineIoLayer::new(Arc::new(MyHandler));

crates/engineioxide/src/service/mod.rs

@@ -17,8 +17,8 @@
 //!     type Data = ();
 //!     fn on_connect(self: Arc<Self>, socket: Arc<Socket<()>>) { }
 //!     fn on_disconnect(&self, socket: Arc<Socket<()>>, reason: DisconnectReason) { }
-//!     fn on_message(&self, msg: Str, socket: Arc<Socket<()>>) { }
-//!     fn on_binary(&self, data: Bytes, socket: Arc<Socket<()>>) { }
+//!     fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<()>>) { }
+//!     fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<()>>) { }
 //! }
 //!
 //! // Create a new engine.io service that will return a 404 not found response for other requests

crates/engineioxide/src/socket.rs

@@ -46,10 +46,10 @@
 //!     fn on_disconnect(&self, socket: Arc<Socket<SocketState>>, reason: DisconnectReason) {
 //!         let cnt = self.user_cnt.fetch_sub(1, Ordering::Relaxed) - 1;
 //!     }
-//!     fn on_message(&self, msg: Str, socket: Arc<Socket<SocketState>>) {
+//!     fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<SocketState>>) {
 //!         *socket.data.id.lock().unwrap() = msg.into(); // bind a provided user id to a socket
 //!     }
-//!     fn on_binary(&self, data: Bytes, socket: Arc<Socket<SocketState>>) { }
+//!     fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<SocketState>>) { }
 //! }
 //!
 //! let svc = EngineIoService::new(Arc::new(MyHandler::default()));

crates/engineioxide/src/str.rs

@@ -100,6 +100,11 @@ impl From<Str> for String {
         unsafe { String::from_utf8_unchecked(vec) }
     }
 }
+impl From<Str> for Vec<u8> {
+    fn from(value: Str) -> Self {
+        Vec::from(value.0)
+    }
+}
 impl Serialize for Str {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where

crates/engineioxide/tests/disconnect_reason.rs

@@ -39,12 +39,12 @@ impl EngineIoHandler for MyHandler {
         self.disconnect_tx.try_send(reason).unwrap();
     }
 
-    fn on_message(&self, msg: Str, socket: Arc<Socket<()>>) {
+    fn on_message(self: &Arc<Self>, msg: Str, socket: Arc<Socket<()>>) {
         println!("Ping pong message {:?}", msg);
         socket.emit(msg).ok();
     }
 
-    fn on_binary(&self, data: Bytes, socket: Arc<Socket<()>>) {
+    fn on_binary(self: &Arc<Self>, data: Bytes, socket: Arc<Socket<()>>) {
         println!("Ping pong binary message {:?}", data);
         socket.emit_binary(data).ok();
     }