split 2 of 772644f, debugging ci

src/connector.rs

@@ -184,11 +184,35 @@ impl Connector {
     ) -> Result<(), Box<dyn Error + Send + Sync>> {
         loop {
             let rx_msg = rx.recv().await;
+            if rx_msg.is_none() {
+                continue;
+            }
 
-            match rx_msg.unwrap() {
+            match self.msg_handler(rx_msg.unwrap(), conn, metadata).await {
+                Ok(true) => continue,
+                Ok(false) => break,
+                Err(e) => return Err(e),
+            }
+        }
+
+        Ok(())
+    }
+
+    async fn msg_handler(
+        &self,
+        msg: Message,
+        conn: &mut Connection<'_>,
+        metadata: &HashMap<String, (u64, String)>,
+    ) -> Result<bool, Box<dyn Error + Send + Sync>> {
+        match msg {
             Message::ClientReq(name) => {
-                    let req = Request::new(name, metadata).unwrap(); // TODO: handle
+                let req = match Request::new(name, metadata) {
+                    Some(req) => req,
+                    None => return Ok(true),
+                };
                 self.request(conn, req).await?;
+
+                Ok(true)
             }
             Message::Shutdown => {
                 let msg = b"DISCONNECT".to_vec();
@@ -200,12 +224,9 @@ impl Connector {
                 )
                 .await?;
 
-                    break;
+                Ok(false)
             }
-                _ => continue,
+            _ => Ok(true),
         }
     }
-
-        Ok(())
-    }
 }