Pass the socket address down to WebsocketHandler::accept.

dtzxporter · Nov 21, 2024 · 4cdf19f · 4cdf19f
1 parent f891104
commit 4cdf19f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@
 
 ### Fixed
 
+# 0.1.32
+
+### Changed
+- **BREAKING**: Changed the signature of `WebsocketHandler::accept()` to also pass the connecting socket address down.
+
+# 0.1.31
+
+### Changed
+- Updated dependencies.
+
 # 0.1.30
 
 ### Fixed

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.31", path = "./hydra-macros" }
-hydra = { version = "0.1.31", path = "./hydra", default-features = false }
+hydra-macros = { version = "0.1.32", path = "./hydra-macros" }
+hydra = { version = "0.1.32", 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.31"
+version = "0.1.32"
 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.31"
+version = "0.1.32"
 edition = "2021"
 readme = "./README.md"
 license.workspace = true

diff --git a/hydra-websockets/examples/server.rs b/hydra-websockets/examples/server.rs
@@ -21,6 +21,7 @@ impl WebsocketHandler for MyWebsocketHandler {
     type Message = ();
 
     fn accept(
+        _address: SocketAddr,
         _request: &WebsocketRequest,
         response: WebsocketResponse,
     ) -> Result<(WebsocketResponse, Self), ExitReason> {

diff --git a/hydra-websockets/src/websocket_handler.rs b/hydra-websockets/src/websocket_handler.rs
@@ -1,4 +1,5 @@
 use std::future::Future;
+use std::net::SocketAddr;
 
 use futures_util::stream;
 use futures_util::SinkExt;
@@ -34,6 +35,7 @@ where
     ///
     /// You can extract information from the request and put it in your handler state.
     fn accept(
+        address: SocketAddr,
         request: &WebsocketRequest,
         response: WebsocketResponse,
     ) -> Result<(WebsocketResponse, Self), ExitReason>;

diff --git a/hydra-websockets/src/websocket_server.rs b/hydra-websockets/src/websocket_server.rs
@@ -99,7 +99,7 @@ where
     let mut handler: Option<T> = None;
 
     let callback = |request: &WebsocketRequest, response: WebsocketResponse| match T::accept(
-        request, response,
+        address, request, response,
     ) {
         Ok((response, rhandler)) => {
             handler = Some(rhandler);

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