Add websocket server child spec method.

dtzxporter · Nov 26, 2024 · 77170b4 · 77170b4
1 parent 4cdf19f
commit 77170b4
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@
 
 ### Fixed
 
+# 0.1.33
+
+### Added
+- Added `WebsocketServer::child_spec()` to make it easier to supervise the server.
+
 # 0.1.32
 
 ### Changed

diff --git a/Cargo.toml b/Cargo.toml
@@ -33,8 +33,8 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
 tracing-subscriber = "0.3"
 dashmap = "6.0.1"
 
-hydra-macros = { version = "0.1.32", path = "./hydra-macros" }
-hydra = { version = "0.1.32", path = "./hydra", default-features = false }
+hydra-macros = { version = "0.1.33", path = "./hydra-macros" }
+hydra = { version = "0.1.33", path = "./hydra", default-features = false }
 
 [profile.release]
 lto = "fat"

diff --git a/hydra-macros/Cargo.toml b/hydra-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydra-macros"
-version = "0.1.32"
+version = "0.1.33"
 edition = "2021"
 license.workspace = true
 repository.workspace = true

diff --git a/hydra-websockets/Cargo.toml b/hydra-websockets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydra-websockets"
-version = "0.1.32"
+version = "0.1.33"
 edition = "2021"
 readme = "./README.md"
 license.workspace = true

diff --git a/hydra-websockets/src/websocket_server.rs b/hydra-websockets/src/websocket_server.rs
@@ -18,8 +18,10 @@ use tungstenite::protocol::WebSocketConfig;
 #[cfg(feature = "native-tls")]
 use tokio_native_tls::TlsAcceptor;
 
+use hydra::ChildSpec;
 use hydra::ExitReason;
 use hydra::GenServer;
+use hydra::GenServerOptions;
 use hydra::Pid;
 use hydra::Process;
 use hydra::ProcessFlags;
@@ -52,6 +54,24 @@ where
     }
 }
 
+impl<T> WebsocketServer<T>
+where
+    T: WebsocketHandler + Send + Sync + 'static,
+{
+    pub fn child_spec(self) -> ChildSpec {
+        ChildSpec::new("WebsocketServer").start(move || {
+            WebsocketServer::start_link(
+                WebsocketServer {
+                    config: self.config.clone(),
+                    server: None,
+                    _handler: PhantomData::<T>,
+                },
+                GenServerOptions::new(),
+            )
+        })
+    }
+}
+
 impl<T> GenServer for WebsocketServer<T>
 where
     T: WebsocketHandler + Send + 'static,

diff --git a/hydra/Cargo.toml b/hydra/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydra"
-version = "0.1.32"
+version = "0.1.33"
 edition = "2021"
 readme.workspace = true
 license.workspace = true