feat: Graceful Shutdown

README.md

@@ -80,6 +80,11 @@ Then your project directory has `wrangler.toml`, `package.json` and a Rust libra
 
 See README of the [template](https://github.com/ohkami-rs/ohkami-templates/tree/main/worker) for details.
 
+### `"graceful"`：Graceful Shutdown
+
+Automatically catch Ctrl-C ( SIGINT ) and perform graceful shutdown.\
+Currently, only supported on `rt_tokio`.
+
 ### `"sse"`：Server-Sent Events
 
 Ohkami responds with HTTP/1.1 `Transfer-Encoding: chunked`.\

Taskfile.yaml

@@ -59,6 +59,7 @@ tasks:
     cmds:
       - cargo test --lib --features rt_tokio,DEBUG,{{.MAYBE_NIGHTLY}}
       - cargo test --lib --features rt_tokio,DEBUG,sse,ws,{{.MAYBE_NIGHTLY}}
+      - cargo test --lib --features rt_tokio,DEBUG,graceful,{{.MAYBE_NIGHTLY}}
 
   test_rt_async-std:
     vars:
@@ -101,6 +102,7 @@ tasks:
       - cargo check --lib --features rt_tokio,{{.MAYBE_NIGHTLY}}
       - cargo check --lib --features rt_tokio,sse,{{.MAYBE_NIGHTLY}}
       - cargo check --lib --features rt_tokio,sse,ws,{{.MAYBE_NIGHTLY}}
+      - cargo check --lib --features rt_tokio,graceful,{{.MAYBE_NIGHTLY}}
 
   check_rt_async-std:
     vars:

ohkami/Cargo.toml

@@ -47,6 +47,7 @@ nightly       = []
 testing       = []
 sse           = ["ohkami_lib/stream"]
 ws            = ["dep:sha1"]
+graceful      = ["rt_tokio", "tokio/signal", "tokio/macros"]
 
 ##### DEBUG #####
 DEBUG = [

ohkami/src/lib.rs

@@ -24,16 +24,23 @@
     all(feature="rt_tokio",     feature="rt_async-std"),
     all(feature="rt_async-std", feature="rt_worker"),
     all(feature="rt_worker",    feature="rt_tokio"),
-))] compile_error!("
-    Can't activate multiple `rt_*` features!
-");
+))] compile_error! {"
+    Can't activate multiple `rt_*` features at once!
+"}
+
+#[cfg(any(
+    all(feature="graceful", not(feature="rt_tokio")),
+))] compile_error! {"
+    In current versoin, `graceful` feature is only supported on `rt_tokio`.
+    Please wait for future development for other runtimes...
+"}
 
 #[cfg(not(feature="DEBUG"))] const _: () = {
     #[cfg(all(feature="rt_worker", not(target_arch="wasm32")))]
-    compile_error!("
+    compile_error! {"
         `rt_worker` must be activated on `wasm32` target!
         (We recommend to touch `.cargo/config.toml`: `[build] target = \"wasm32-unknown-unknown\"`)
-    ");
+    "}
 };
 
 

ohkami/src/ohkami/mod.rs

@@ -272,7 +272,40 @@ impl Ohkami {
             Err(e)       => panic!("Failed to bind TCP listener: {e}"),
         };
 
-        #[cfg(feature="rt_tokio")] {
+        #[cfg(all(feature="rt_tokio", feature="graceful"))] {
+            let ctrl_c = tokio::signal::ctrl_c();
+            let (ctrl_c_tx, ctrl_c_rx) = tokio::sync::watch::channel(());
+            __rt__::task::spawn(async move {
+                ctrl_c.await.expect("something was unexpected around Ctrl-C");
+                drop(ctrl_c_rx);
+            });
+
+            let (close_tx, close_rx) = tokio::sync::watch::channel(());
+            loop {
+                tokio::select! {
+                    accept = listener.accept() => {
+                        crate::DEBUG!("Accepted {accept:#?}");
+                        let Ok((connection, _)) = accept else {continue};
+                        let session = Session::new(router.clone(), connection);
+                        let close_rx = close_rx.clone();
+                        __rt__::task::spawn(async {
+                            session.manage().await;
+                            drop(close_rx)
+                        });
+                    },
+                    _ = ctrl_c_tx.closed() => {
+                        crate::DEBUG!("Recieved Ctrl-C, trying graceful shutdown");
+
+                        crate::DEBUG!("Waiting {} session(s) to finish...", close_tx.receiver_count());
+                        drop(close_rx);
+                        close_tx.closed().await;
+
+                        break
+                    }
+                }
+            }
+        }
+        #[cfg(all(feature="rt_tokio", not(feature="graceful")))] {
             loop {
                 let Ok((connection, _)) = listener.accept().await else {continue};
 

ohkami/src/ohkami/router/radix.rs

@@ -1,6 +1,6 @@
 use crate::request::Path;
 use crate::{Method, Request, Response};
-use crate::fangs::{FangProcCaller, BoxedFPC, Handler};
+use crate::fangs::{FangProcCaller, BoxedFPC};
 use ohkami_lib::Slice;
 use std::fmt::Write as _;
 
@@ -30,21 +30,8 @@ pub(super) struct Node {
                 }
             }
 
-            enum HandlerMarker { None, Some }
-            impl From<Option<&Handler>> for HandlerMarker {
-                fn from(h: Option<&Handler>) -> Self {
-                    match h {Some(_) => Self::Some, None => Self::None}
-                }
-            }
-            impl std::fmt::Debug for HandlerMarker {
-                fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                    match self {Self::Some => f.write_char('@'), Self::None => f.write_str("None")}
-                }
-            }
-
             f.debug_struct("")
                 .field("patterns", &PatternsMarker(self.patterns))
-                // .field("proc", &HandlerMarker::from(self.handler.as_ref()))
                 .field("children", &self.children)
                 .finish()
         }

ohkami_lib/src/serde_urlencoded/_test.rs

@@ -16,29 +16,13 @@ enum Gender {
     Other,
 }
 
-#[derive(Serialize, Deserialize, PartialEq, Debug)]
-enum Difficulty {
-    Low,
-    Middle,
-    High,
-    Ultimate,
-}
-
-
 #[derive(Serialize, Deserialize, PartialEq, Debug)]
 struct User<'s> {
     name:   Cow<'s, str>,
     age:    Option<Age>,
     gender: Option<Gender>,
 }
 
-#[derive(Serialize, Deserialize, PartialEq, Debug)]
-struct Problem<'s> {
-    title:      Cow<'s, str>,
-    content:    String,
-    difficulty: Option<Difficulty>,
-}
-
 #[derive(Deserialize, PartialEq, Debug)]
 struct URLRequest<'req> {
     url: Cow<'req, str>,