refactor(glueball): use SynthesisStream trait everywhere

Author: azaleacolburn

glueball/src/connection.rs

@@ -6,7 +6,7 @@ use crate::{
     error_global, info_global,
     messaging::{handle_client_message, wait_for_initialization},
     model::ServerToClientMessage,
-    prefixed::{ConnectionStatus, into_prefixed_or_respond},
+    prefixed::{ConnectionStatus, SynthesisStream, into_prefixed_or_respond},
     room::ClientId,
     state::State,
     util::{server_sent_msg, trim_uuid},
@@ -15,18 +15,14 @@ use crate::{
 use anyhow::{Result, bail};
 use futures_util::{SinkExt, StreamExt};
 use std::{net::SocketAddr, sync::Arc, time::Duration};
-use tokio::{
-    io::{AsyncRead, AsyncWrite},
-    sync::mpsc,
-    time::timeout,
-};
+use tokio::{sync::mpsc, time::timeout};
 use tokio_tungstenite::tungstenite::Message;
 
 pub const TIMEOUT: Duration = Duration::from_secs(30);
 
 pub async fn handle_connection<S>(state: Arc<State>, raw_stream: S, addr: SocketAddr)
 where
-    S: AsyncRead + AsyncWrite + Unpin + Send + 'static,
+    S: SynthesisStream,
 {
     let ConnectionStatus::Ws(stream) = into_prefixed_or_respond(raw_stream, addr).await else {
         return;

glueball/src/prefixed.rs

@@ -33,8 +33,10 @@ impl<S: AsyncRead + Unpin> AsyncRead for Prefixed<S> {
 
         if pos < data.len() {
             let n = (data.len() - pos).min(buf.remaining());
+
             buf.put_slice(&data[pos..pos + n]);
             self.prefix.set_position((pos + n) as u64);
+
             return Poll::Ready(Ok(()));
         }
 
@@ -72,7 +74,7 @@ pub enum ConnectionStatus<S> {
 
 pub async fn into_prefixed_or_respond<S>(mut raw_stream: S, addr: SocketAddr) -> ConnectionStatus<S>
 where
-    S: AsyncRead + AsyncWrite + Unpin + Send + 'static,
+    S: SynthesisStream,
 {
     // "Peek" at the request: read the first chunk, then replay it in front of
     // the stream. `peek()` is an inherent method on `TcpStream` (not a trait),