⚗️ Update experimental code

tracing-surreal/src/bin/host.rs

@@ -5,7 +5,7 @@ use surrealdb::{
     opt::auth::Root,
     Surreal,
 };
-use tokio::time::sleep;
+use tokio::time::timeout;
 use tracing_surreal::{stop::Stop, tmp::server::ServerBuilder};
 
 async fn db() -> AnyRes<Surreal<Client>> {
@@ -26,12 +26,12 @@ async fn main() -> AnyRes {
     let mut server = ServerBuilder::from_stop_default(&stop).start().await?;
     println!("{}", server.get_local_addr());
 
-    let grace_type = tokio::select! {
-        _ = sleep(Duration::from_secs_f64(5.0)) => {
+    let grace_type = match timeout(Duration::from_secs_f64(5.0), &mut server).await {
+        Err(_) => {
             println!("5s elapsed, initiating shutdown...");
             server.graceful_shutdown().await??
         }
-        res = server.get_routine_mut() => {
+        Ok(res) => {
             println!("routine exited");
             res??
         }

tracing-surreal/src/tmp/server.rs

@@ -1,8 +1,10 @@
 use crate::stop::Stop;
 use std::{
-    future::IntoFuture,
+    future::Future,
     io,
     net::{Ipv4Addr, SocketAddr, SocketAddrV4},
+    pin::Pin,
+    task::{Context, Poll},
     time::Duration,
 };
 use surrealdb::Connection;
@@ -228,11 +230,14 @@ impl<C: Connection + Clone> ServerBuilder<C> {
     }
 }
 
+type RoutineOutput = io::Result<GracefulType>;
+type ServerOutput = Result<RoutineOutput, JoinError>;
+
 #[derive(Debug)]
 pub struct ServerHandle {
     local_addr: SocketAddr,
     shutdown_s: oneshot::Sender<()>,
-    routine: JoinHandle<io::Result<GracefulType>>,
+    routine: JoinHandle<RoutineOutput>,
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
@@ -246,21 +251,16 @@ impl ServerHandle {
         self.local_addr
     }
 
-    pub fn get_routine_mut(&mut self) -> &mut JoinHandle<io::Result<GracefulType>> {
-        &mut self.routine
-    }
-
-    pub async fn graceful_shutdown(self) -> Result<io::Result<GracefulType>, JoinError> {
+    pub async fn graceful_shutdown(self) -> ServerOutput {
         self.shutdown_s.send(()).ok();
         self.routine.await
     }
 }
 
-impl IntoFuture for ServerHandle {
-    type Output = Result<io::Result<GracefulType>, JoinError>;
-    type IntoFuture = JoinHandle<io::Result<GracefulType>>;
+impl Future for ServerHandle {
+    type Output = ServerOutput;
 
-    fn into_future(self) -> Self::IntoFuture {
-        self.routine
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        Pin::new(&mut self.routine).poll(cx)
     }
 }