Merge branch 'develop' into set-response-body

Author: nick1udwig

Cargo.lock

@@ -9,7 +9,7 @@ repository = "https://github.com/hyperware-ai/process_lib"
 license = "Apache-2.0"
 
 [features]
-hyperapp = ["dep:futures-util", "dep:uuid", "logging"]
+hyperapp = ["dep:futures-util", "dep:futures-channel", "dep:uuid", "logging"]
 logging = ["dep:color-eyre", "dep:tracing", "dep:tracing-error", "dep:tracing-subscriber"]
 hyperwallet = ["dep:hex", "dep:sha3"]
 simulation-mode = []
@@ -42,6 +42,7 @@ url = "2.4.1"
 wit-bindgen = "0.42.1"
 
 futures-util = { version = "0.3", optional = true }
+futures-channel = { version = "0.3", optional = true }
 uuid = { version = "1.0", features = ["v4"], optional = true }
 
 color-eyre = { version = "0.6", features = ["capture-spantrace"], optional = true }

Cargo.toml

@@ -1,7 +1,11 @@
 use std::cell::RefCell;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::future::Future;
 use std::pin::Pin;
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
 use std::task::{Context, Poll};
 
 use crate::{
@@ -10,21 +14,22 @@ use crate::{
     logging::{error, info},
     set_state, timer, Address, BuildError, LazyLoadBlob, Message, Request, SendError,
 };
-use futures_util::task::noop_waker_ref;
+use futures_channel::{mpsc, oneshot};
+use futures_util::task::{waker_ref, ArcWake};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use uuid::Uuid;
 
 thread_local! {
     static SPAWN_QUEUE: RefCell<Vec<Pin<Box<dyn Future<Output = ()>>>>> = RefCell::new(Vec::new());
 
-
     pub static APP_CONTEXT: RefCell<AppContext> = RefCell::new(AppContext {
         hidden_state: None,
         executor: Executor::new(),
     });
 
     pub static RESPONSE_REGISTRY: RefCell<HashMap<String, Vec<u8>>> = RefCell::new(HashMap::new());
+    pub static CANCELLED_RESPONSES: RefCell<HashSet<String>> = RefCell::new(HashSet::new());
 
     pub static APP_HELPERS: RefCell<AppHelpers> = RefCell::new(AppHelpers {
         current_server: None,
@@ -203,10 +208,53 @@ pub struct Executor {
     tasks: Vec<Pin<Box<dyn Future<Output = ()>>>>,
 }
 
-pub fn spawn(fut: impl Future<Output = ()> + 'static) {
+struct ExecutorWakeFlag {
+    triggered: AtomicBool,
+}
+
+impl ExecutorWakeFlag {
+    fn new() -> Self {
+        Self {
+            triggered: AtomicBool::new(false),
+        }
+    }
+
+    fn take(&self) -> bool {
+        self.triggered.swap(false, Ordering::SeqCst)
+    }
+}
+
+impl ArcWake for ExecutorWakeFlag {
+    fn wake_by_ref(arc_self: &Arc<Self>) {
+        arc_self.triggered.store(true, Ordering::SeqCst);
+    }
+}
+
+pub struct JoinHandle<T> {
+    receiver: oneshot::Receiver<T>,
+}
+
+impl<T> Future for JoinHandle<T> {
+    type Output = Result<T, oneshot::Canceled>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let receiver = &mut self.get_mut().receiver;
+        Pin::new(receiver).poll(cx)
+    }
+}
+
+pub fn spawn<T>(fut: impl Future<Output = T> + 'static) -> JoinHandle<T>
+where
+    T: 'static,
+{
+    let (sender, receiver) = oneshot::channel();
     SPAWN_QUEUE.with(|queue| {
-        queue.borrow_mut().push(Box::pin(fut));
-    })
+        queue.borrow_mut().push(Box::pin(async move {
+            let result = fut.await;
+            let _ = sender.send(result);
+        }));
+    });
+    JoinHandle { receiver }
 }
 
 impl Executor {
@@ -215,19 +263,24 @@ impl Executor {
     }
 
     pub fn poll_all_tasks(&mut self) {
+        let wake_flag = Arc::new(ExecutorWakeFlag::new());
         loop {
             // Drain any newly spawned tasks into our task list
             SPAWN_QUEUE.with(|queue| {
                 self.tasks.append(&mut queue.borrow_mut());
             });
 
-            // Poll all tasks, collecting completed ones
+            // Poll all tasks, collecting completed ones.
+            // Put waker into context so tasks can wake the executor if needed.
             let mut completed = Vec::new();
-            let mut ctx = Context::from_waker(noop_waker_ref());
+            {
+                let waker = waker_ref(&wake_flag);
+                let mut ctx = Context::from_waker(&waker);
 
-            for i in 0..self.tasks.len() {
-                if let Poll::Ready(()) = self.tasks[i].as_mut().poll(&mut ctx) {
-                    completed.push(i);
+                for i in 0..self.tasks.len() {
+                    if let Poll::Ready(()) = self.tasks[i].as_mut().poll(&mut ctx) {
+                        completed.push(i);
+                    }
                 }
             }
 
@@ -238,9 +291,10 @@ impl Executor {
 
             // Check if there are new tasks spawned during polling
             let has_new_tasks = SPAWN_QUEUE.with(|queue| !queue.borrow().is_empty());
+            // Check if any task woke the executor that needs to be re-polled
+            let was_woken = wake_flag.take();
 
-            // Continue if new tasks were spawned, otherwise we're done
-            if !has_new_tasks {
+            if !has_new_tasks && !was_woken {
                 break;
             }
         }
@@ -250,6 +304,7 @@ struct ResponseFuture {
     correlation_id: String,
     // Capture HTTP context at creation time
     http_context: Option<HttpRequestContext>,
+    resolved: bool,
 }
 
 impl ResponseFuture {
@@ -261,6 +316,7 @@ impl ResponseFuture {
         Self {
             correlation_id,
             http_context,
+            resolved: false,
         }
     }
 }
@@ -269,16 +325,18 @@ impl Future for ResponseFuture {
     type Output = Vec<u8>;
 
     fn poll(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let correlation_id = &self.correlation_id;
+        let this = self.get_mut();
 
         let maybe_bytes = RESPONSE_REGISTRY.with(|registry| {
             let mut registry_mut = registry.borrow_mut();
-            registry_mut.remove(correlation_id)
+            registry_mut.remove(&this.correlation_id)
         });
 
         if let Some(bytes) = maybe_bytes {
+            this.resolved = true;
+
             // Restore this future's captured context
-            if let Some(ref context) = self.http_context {
+            if let Some(ref context) = this.http_context {
                 APP_HELPERS.with(|helpers| {
                     helpers.borrow_mut().current_http_context = Some(context.clone());
                 });
@@ -291,6 +349,23 @@ impl Future for ResponseFuture {
     }
 }
 
+impl Drop for ResponseFuture {
+    fn drop(&mut self) {
+        // We want to avoid cleaning up after successful responses
+        if self.resolved {
+            return;
+        }
+
+        RESPONSE_REGISTRY.with(|registry| {
+            registry.borrow_mut().remove(&self.correlation_id);
+        });
+
+        CANCELLED_RESPONSES.with(|set| {
+            set.borrow_mut().insert(self.correlation_id.clone());
+        });
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, Error)]
 pub enum AppSendError {
     #[error("SendError: {0}")]
@@ -477,12 +552,17 @@ where
 
 pub fn setup_server(
     ui_config: Option<&HttpBindingConfig>,
+    ui_path: Option<String>,
     endpoints: &[Binding],
 ) -> http::server::HttpServer {
     let mut server = http::server::HttpServer::new(5);
 
     if let Some(ui) = ui_config {
-        if let Err(e) = server.serve_ui("ui", vec!["/"], ui.clone()) {
+        if let Err(e) = server.serve_ui(
+            &ui_path.unwrap_or_else(|| "ui".to_string()),
+            vec!["/"],
+            ui.clone(),
+        ) {
             panic!("failed to serve UI: {e}. Make sure that a ui folder is in /pkg");
         }
     }