minor cleanup

Author: robherley

crates/funcgg-runtime/src/ext/mod.rs

@@ -87,7 +87,7 @@ async fn op_set_response(
         let state_borrow = state.borrow();
         let sandbox_state = state_borrow.borrow::<Rc<RefCell<super::sandbox::State>>>();
         let mut borrowed = sandbox_state.borrow_mut();
-        (borrowed.response_oneshot_tx.take(), borrowed.request_id)
+        (borrowed.response_tx.take(), borrowed.request_id)
     };
 
     res.apply_runtime_headers(request_id);

crates/funcgg-runtime/src/js/worker.js

@@ -20,15 +20,18 @@ async function resolveHandler() {
 }
 
 async function work() {
+  let response;
   try {
     const handler = await resolveHandler();
-    const response = await handler(Func.request);
-    return Func.setResponse(response);
+    response = await handler(Func.request);
   } catch (error) {
-    const msg = error && error.message ? error.message : String(error);
-    return new Response(`Internal Server Error: ${msg}`, {
+    const msg =
+      error.stack || `Internal Server Error: ${error?.message || error}`;
+    response = new Response(msg, {
       status: 500,
     });
+  } finally {
+    Func.setResponse(response);
   }
 }
 

crates/funcgg-runtime/src/sandbox.rs

@@ -28,7 +28,7 @@ pub struct State {
     pub request_id: Uuid,
     pub incoming_body_rx: Rc<Mutex<mpsc::Receiver<Result<bytes::Bytes, String>>>>,
     pub outgoing_body_tx: mpsc::Sender<bytes::Bytes>,
-    pub response_oneshot_tx: Option<oneshot::Sender<http::Response>>,
+    pub response_tx: Option<oneshot::Sender<http::Response>>,
 }
 
 pub struct Sandbox {
@@ -42,7 +42,7 @@ impl Sandbox {
         startup_snapshot: Option<&'static [u8]>,
         incoming_body_rx: mpsc::Receiver<Result<bytes::Bytes, String>>,
         outgoing_body_tx: mpsc::Sender<bytes::Bytes>,
-        response_oneshot_tx: oneshot::Sender<http::Response>,
+        response_tx: oneshot::Sender<http::Response>,
     ) -> Result<Self> {
         _ = CryptoProvider::install_default(aws_lc_rs::default_provider());
 
@@ -52,7 +52,7 @@ impl Sandbox {
             res: None,
             incoming_body_rx: Rc::new(Mutex::new(incoming_body_rx)),
             outgoing_body_tx,
-            response_oneshot_tx: Some(response_oneshot_tx),
+            response_tx: Some(response_tx),
         }));
 
         let extension_transpiler = Rc::new(loader::transpile);

crates/funcgg-worker/src/pool.rs

@@ -82,7 +82,7 @@ impl Pool {
         http_request: http::Request,
         incoming_body_rx: mpsc::Receiver<Result<bytes::Bytes, String>>,
         outgoing_body_tx: mpsc::Sender<bytes::Bytes>,
-        response_oneshot_tx: oneshot::Sender<http::Response>,
+        response_tx: oneshot::Sender<http::Response>,
     ) -> Result<(), String> {
         let request_id = Uuid::now_v7();
 
@@ -93,7 +93,7 @@ impl Pool {
             http_request,
             incoming_body_rx,
             outgoing_body_tx,
-            response_oneshot_tx,
+            response_tx,
         };
 
         tracing::debug!(

crates/funcgg-worker/src/worker.rs

@@ -14,7 +14,7 @@ pub struct WorkerRequest {
     pub http_request: http::Request,
     pub incoming_body_rx: mpsc::Receiver<Result<bytes::Bytes, String>>,
     pub outgoing_body_tx: mpsc::Sender<bytes::Bytes>,
-    pub response_oneshot_tx: oneshot::Sender<http::Response>,
+    pub response_tx: oneshot::Sender<http::Response>,
 }
 
 pub struct Worker {
@@ -63,7 +63,7 @@ impl Worker {
             Some(STARTUP_SNAPSHOT),
             request.incoming_body_rx,
             request.outgoing_body_tx,
-            request.response_oneshot_tx,
+            request.response_tx,
         ) {
             Ok(rt) => rt,
             Err(e) => {