Add bare minimum single-user multiplayer functionality #30

rc_multiplayer/src/handlers/ingame_broadcast.rs

@@ -0,0 +1,51 @@
+pub struct Broadcaster<const EXCLUDE_SENDER: bool, const CODE_IN: i16, const CODE_OUT: i16, const PROPERTY: u8, InOut: byteserde::des_slice::ByteDeserializeSlice<InOut> + byteserde::ser_heap::ByteSerializeHeap + Send + Sync + 'static> {
+    msg_router: tokio::sync::mpsc::Sender<crate::matches::GameMessage>,
+    code_out: rlnl::event_code::NetworkEvent,
+    property: literustlib::packet::Property,
+    _in: std::marker::PhantomData<InOut>,
+}
+
+impl <const EXCLUDE_SENDER: bool, const CODE_IN: i16, const CODE_OUT: i16, const PROPERTY: u8, InOut: byteserde::des_slice::ByteDeserializeSlice<InOut> + byteserde::ser_heap::ByteSerializeHeap + Send + Sync + 'static> Broadcaster<EXCLUDE_SENDER, CODE_IN, CODE_OUT, PROPERTY, InOut> {
+    pub fn handler(init_ctx: &crate::InitConfig) -> crate::handlers::simple_typed::SimpleRlnl<InOut, Self> {
+        crate::handlers::simple_typed::SimpleRlnl::new(Broadcaster::new(init_ctx))
+    }
+
+    fn new(init_ctx: &crate::InitConfig) -> Self {
+        Self {
+            msg_router: init_ctx.matches_chann.clone(),
+            code_out: crate::handler::i16_to_event_or_panic(CODE_OUT),
+            property: literustlib::packet::Property::try_from(PROPERTY).expect("Invalid literustlib packet property"),
+            _in: std::marker::PhantomData::default(),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl <const EXCLUDE_SENDER: bool, const CODE_IN: i16, const CODE_OUT: i16, const PROPERTY: u8, InOut: byteserde::des_slice::ByteDeserializeSlice<InOut> + byteserde::ser_heap::ByteSerializeHeap + Send + Sync + 'static> crate::handlers::simple_typed::RlnlEventCodeHandler for Broadcaster<EXCLUDE_SENDER, CODE_IN, CODE_OUT, PROPERTY, InOut> {
+    type In = InOut;
+    const CODE: rlnl::event_code::NetworkEvent = crate::handler::i16_to_event_or_panic(CODE_IN);
+
+    async fn handle(&self, data: Self::In, _peer: &std::sync::Arc<literustlib_server::Connection<crate::PacketData>>, user: &crate::UserData, _sender: &std::sync::Arc<literustlib_server::DataSender<crate::PacketData>>) {
+        if let Some(user_info) = user.user().await {
+
+            if EXCLUDE_SENDER {
+                crate::events::log_channel_send_failure(self.msg_router.send(crate::matches::GameMessage::RebroadcastRlnl {
+                    skip_user_id: user_info.user_id(),
+                    event: self.code_out,
+                    property: self.property,
+                    data: Some(Box::new(data)),
+                }).await);
+            } else {
+                crate::events::log_channel_send_failure(self.msg_router.send(crate::matches::GameMessage::BroadcastRlnl {
+                    user_id: user_info.user_id(),
+                    event: self.code_out,
+                    property: self.property,
+                    data: Some(Box::new(data)),
+                }).await);
+            }
+
+        } else {
+            log::error!("Failed to rebroadcast OnPlayerInputChanged for user (no auth!)");
+        }
+    }
+}

rc_multiplayer/src/handlers/ingame_broadcast_dataless.rs

@@ -0,0 +1,47 @@
+pub struct DatalessBroadcaster<const EXCLUDE_SENDER: bool, const CODE_IN: i16, const CODE_OUT: i16, const PROPERTY: u8> {
+    msg_router: tokio::sync::mpsc::Sender<crate::matches::GameMessage>,
+    code_out: rlnl::event_code::NetworkEvent,
+    property: literustlib::packet::Property,
+}
+
+impl <const EXCLUDE_SENDER: bool, const CODE_IN: i16, const CODE_OUT: i16, const PROPERTY: u8> DatalessBroadcaster<EXCLUDE_SENDER, CODE_IN, CODE_OUT, PROPERTY> {
+    pub fn handler(init_ctx: &crate::InitConfig) -> crate::handlers::dataless::Dataless<Self> {
+        crate::handlers::dataless::Dataless::new(Self::new(init_ctx))
+    }
+
+    fn new(init_ctx: &crate::InitConfig) -> Self {
+        Self {
+            msg_router: init_ctx.matches_chann.clone(),
+            code_out: crate::handler::i16_to_event_or_panic(CODE_OUT),
+            property: literustlib::packet::Property::try_from(PROPERTY).expect("Invalid literustlib packet property"),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl <const EXCLUDE_SENDER: bool, const CODE_IN: i16, const CODE_OUT: i16, const PROPERTY: u8> crate::handlers::dataless::DatalessEventCodeHandler for DatalessBroadcaster<EXCLUDE_SENDER, CODE_IN, CODE_OUT, PROPERTY> {
+    const CODE: rlnl::event_code::NetworkEvent = crate::handler::i16_to_event_or_panic(CODE_IN);
+
+    async fn handle(&self, _peer: &std::sync::Arc<literustlib_server::Connection<crate::PacketData>>, user: &crate::UserData, _sender: &std::sync::Arc<literustlib_server::DataSender<crate::PacketData>>) {
+        if let Some(user_info) = user.user().await {
+            if EXCLUDE_SENDER {
+                crate::events::log_channel_send_failure(self.msg_router.send(crate::matches::GameMessage::RebroadcastRlnl {
+                    skip_user_id: user_info.user_id(),
+                    event: self.code_out,
+                    property: self.property,
+                    data: None,
+                }).await);
+            } else {
+                crate::events::log_channel_send_failure(self.msg_router.send(crate::matches::GameMessage::BroadcastRlnl {
+                    user_id: user_info.user_id(),
+                    event: self.code_out,
+                    property: self.property,
+                    data: None,
+                }).await);
+            }
+
+        } else {
+            log::error!("Failed to rebroadcast OnPlayerInputChanged for user (no auth!)");
+        }
+    }
+}

rc_multiplayer/src/handlers/mod.rs

@@ -1,2 +1,11 @@
-pub mod simple_typed;
-pub mod dataless;
+mod simple_typed;
+pub use simple_typed::{RlnlEventCodeHandler, SimpleRlnl, RlnlSender};
+
+mod dataless;
+pub use dataless::{Dataless, DatalessEventCodeHandler};
+
+mod ingame_broadcast;
+pub use ingame_broadcast::Broadcaster;
+
+mod ingame_broadcast_dataless;
+pub use ingame_broadcast_dataless::DatalessBroadcaster;

rc_multiplayer/src/handlers/simple_typed.rs

@@ -46,7 +46,7 @@ impl <'a> RlnlSender<'a> {
         }
     }
 
-    pub async fn send_data<D: byteserde::ser_heap::ByteSerializeHeap>(&self, data: &D, event: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, conn: &literustlib_server::Connection<crate::PacketData>) -> std::io::Result<usize> {
+    pub async fn send_data<D: byteserde::ser_heap::ByteSerializeHeap + ?Sized>(&self, data: &D, event: rlnl::event_code::NetworkEvent, property: literustlib::packet::Property, conn: &literustlib_server::Connection<crate::PacketData>) -> std::io::Result<usize> {
         let mut ser = byteserde::ser_heap::ByteSerializerHeap::default();
         data.byte_serialize_heap(&mut ser).map_err(|e| std::io::Error::new(std::io::ErrorKind::Unsupported, e.message))?;
         let event_data = crate::handler::EventData::with_data(