Remove remaining instances of router

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>

zrpc/src/peer.rs

@@ -1,4 +1,4 @@
-use crate::proto::{self, EnvelopedMessage, MessageStream, RequestMessage};
+use crate::proto::{self, AnyTypedEnvelope, EnvelopedMessage, MessageStream, RequestMessage};
 use anyhow::{anyhow, Context, Result};
 use async_lock::{Mutex, RwLock};
 use async_tungstenite::tungstenite::{Error as WebSocketError, Message as WebSocketMessage};
@@ -8,7 +8,6 @@ use postage::{
     prelude::{Sink as _, Stream as _},
 };
 use std::{
-    any::Any,
     collections::HashMap,
     fmt,
     future::Future,
@@ -105,7 +104,7 @@ impl Peer {
     ) -> (
         ConnectionId,
         impl Future<Output = anyhow::Result<()>> + Send,
-        mpsc::Receiver<Box<dyn Any + Sync + Send>>,
+        mpsc::Receiver<Box<dyn AnyTypedEnvelope>>,
     )
     where
         Conn: futures::Sink<WebSocketMessage, Error = WebSocketError>
@@ -409,10 +408,11 @@ mod tests {
             client2.disconnect(client1_conn_id).await;
 
             async fn handle_messages(
-                mut messages: mpsc::Receiver<Box<dyn Any + Sync + Send>>,
+                mut messages: mpsc::Receiver<Box<dyn AnyTypedEnvelope>>,
                 peer: Arc<Peer>,
             ) -> Result<()> {
                 while let Some(envelope) = messages.next().await {
+                    let envelope = envelope.into_any();
                     if let Some(envelope) = envelope.downcast_ref::<TypedEnvelope<proto::Ping>>() {
                         let receipt = envelope.receipt();
                         peer.respond(

zrpc/src/proto.rs

@@ -3,7 +3,7 @@ use anyhow::Result;
 use async_tungstenite::tungstenite::{Error as WebSocketError, Message as WebSocketMessage};
 use futures::{SinkExt as _, StreamExt as _};
 use prost::Message;
-use std::any::Any;
+use std::any::{Any, TypeId};
 use std::{
     io,
     time::{Duration, SystemTime, UNIX_EPOCH},
@@ -31,9 +31,34 @@ pub trait RequestMessage: EnvelopedMessage {
     type Response: EnvelopedMessage;
 }
 
+pub trait AnyTypedEnvelope: 'static + Send + Sync {
+    fn payload_type_id(&self) -> TypeId;
+    fn payload_type_name(&self) -> &'static str;
+    fn as_any(&self) -> &dyn Any;
+    fn into_any(self: Box<Self>) -> Box<dyn Any + Send + Sync>;
+}
+
+impl<T: EnvelopedMessage> AnyTypedEnvelope for TypedEnvelope<T> {
+    fn payload_type_id(&self) -> TypeId {
+        TypeId::of::<T>()
+    }
+
+    fn payload_type_name(&self) -> &'static str {
+        T::NAME
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn into_any(self: Box<Self>) -> Box<dyn Any + Send + Sync> {
+        self
+    }
+}
+
 macro_rules! messages {
     ($($name:ident),* $(,)?) => {
-        pub fn build_typed_envelope(sender_id: ConnectionId, envelope: Envelope) -> Option<Box<dyn Any + Send + Sync>> {
+        pub fn build_typed_envelope(sender_id: ConnectionId, envelope: Envelope) -> Option<Box<dyn AnyTypedEnvelope>> {
             match envelope.payload {
                 $(Some(envelope::Payload::$name(payload)) => {
                     Some(Box::new(TypedEnvelope {