feat: implement default peer message processing

src/message/handlers.rs

@@ -9,48 +9,46 @@ use super::server::{
     WishListIntervalHandler,
 };
 
-pub trait MessageHandler {
+pub trait MessageHandler<Op> {
     fn get_code(&self) -> u8;
-    fn handle(&self, message: &mut Message, sender: Sender<ServerOperation>);
+    fn handle(&self, message: &mut Message, sender: Sender<Op>);
 }
-pub struct Handlers {
-    handlers: HashMap<u8, Box<dyn MessageHandler>>,
+pub struct Handlers<Op> {
+    handlers: HashMap<u8, Box<dyn MessageHandler<Op>>>,
 }
 
-impl Handlers {
+impl<Op> Handlers<Op> {
     pub fn new() -> Self {
         Self {
             handlers: HashMap::new(),
         }
     }
+
     pub fn new_with_server_handlers() -> Self {
         let mut handlers = Self::new();
-        handlers.add_server_handlers();
+        handlers.register_handler(LoginHandler);
+        handlers.register_handler(RoomListHandler);
+        handlers.register_handler(ExcludedSearchPhrasesHandler);
+        handlers.register_handler(PrivilegedUsersHandler);
+        handlers.register_handler(MessageUser);
+        handlers.register_handler(WishListIntervalHandler);
+        handlers.register_handler(ParentMinSpeedHandler);
+        handlers.register_handler(ParentSpeedRatioHandler);
+        handlers.register_handler(PrivilegedUsersHandler);
+        handlers.register_handler(FileSearch);
+        handlers.register_handler(ConnectToPeerHandler);
         handlers
     }
 
-    fn add_server_handlers(&mut self) {
-        self.register_handler(LoginHandler);
-        self.register_handler(RoomListHandler);
-        self.register_handler(ExcludedSearchPhrasesHandler);
-        self.register_handler(PrivilegedUsersHandler);
-        self.register_handler(MessageUser);
-        self.register_handler(WishListIntervalHandler);
-        self.register_handler(ParentMinSpeedHandler);
-        self.register_handler(ParentSpeedRatioHandler);
-        self.register_handler(PrivilegedUsersHandler);
-        self.register_handler(FileSearch);
-        self.register_handler(ConnectToPeerHandler);
-    }
-
-    pub fn register_handler<H: 'static + MessageHandler + Send + Sync>(
-        &mut self,
-        handler: H,
-    ) -> &mut Self {
+    /// Register a handler for this particular `Op`.
+    pub fn register_handler<H>(&mut self, handler: H) -> &mut Self
+    where
+        H: 'static + MessageHandler<Op> + Send + Sync,
+    {
         self.handlers.insert(handler.get_code(), Box::new(handler));
         self
     }
-    pub fn get_handler(&self, code: u8) -> Option<&Box<dyn MessageHandler>> {
+    pub fn get_handler(&self, code: u8) -> Option<&Box<dyn MessageHandler<Op>>> {
         self.handlers.get(&code)
     }
 }