Restore server typestate and split configuration #279
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| //! Binding configuration for [`WireframeServer`]. | ||
|
|
||
| use core::marker::PhantomData; | ||
| use std::{ | ||
| net::{SocketAddr, TcpListener as StdTcpListener}, | ||
| sync::Arc, | ||
| }; | ||
|
|
||
| use tokio::net::TcpListener; | ||
|
|
||
| use super::{Unbound, WireframeServer}; | ||
| use crate::{ | ||
| app::WireframeApp, | ||
| preamble::Preamble, | ||
| server::{Bound, ServerError}, | ||
| }; | ||
|
|
||
| impl<F, T> WireframeServer<F, T, Unbound> | ||
| where | ||
| F: Fn() -> WireframeApp + Send + Sync + Clone + 'static, | ||
| T: Preamble, | ||
| { | ||
| /// Return `None` as the server is not bound. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use wireframe::{app::WireframeApp, server::WireframeServer}; | ||
| /// | ||
| /// assert!( | ||
| /// WireframeServer::new(|| WireframeApp::default()) | ||
| /// .local_addr() | ||
| /// .is_none() | ||
| /// ); | ||
| /// ``` | ||
| #[must_use] | ||
| pub const fn local_addr(&self) -> Option<SocketAddr> { None } | ||
|
|
||
| /// Bind to a fresh address. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::net::{Ipv4Addr, SocketAddr}; | ||
| /// | ||
| /// use wireframe::{app::WireframeApp, server::WireframeServer}; | ||
| /// | ||
| /// let addr = SocketAddr::from((Ipv4Addr::LOCALHOST, 0)); | ||
| /// let server = WireframeServer::new(|| WireframeApp::default()) | ||
| /// .bind(addr) | ||
| /// .expect("bind failed"); | ||
| /// assert!(server.local_addr().is_some()); | ||
| /// ``` | ||
| /// | ||
| /// # Errors | ||
| /// Returns a [`ServerError`] if binding or configuring the listener fails. | ||
| pub fn bind(self, addr: SocketAddr) -> Result<WireframeServer<F, T, Bound>, ServerError> { | ||
| let std = StdTcpListener::bind(addr).map_err(ServerError::Bind)?; | ||
| self.bind_listener(std) | ||
| } | ||
|
Comment on lines
+57
to
+60
Contributor
There was a problem hiding this comment. 🧹 Nitpick (assertive) Factor out duplicated listener-setup code Both Also applies to: 143-180 🤖 Prompt for AI Agents |
||
|
|
||
| /// Bind to an existing `StdTcpListener`. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::net::{Ipv4Addr, SocketAddr, TcpListener as StdTcpListener}; | ||
| /// | ||
| /// use wireframe::{app::WireframeApp, server::WireframeServer}; | ||
| /// | ||
| /// let std = StdTcpListener::bind(SocketAddr::from((Ipv4Addr::LOCALHOST, 0))).unwrap(); | ||
| /// let server = WireframeServer::new(|| WireframeApp::default()) | ||
| /// .bind_listener(std) | ||
| /// .expect("bind failed"); | ||
| /// assert!(server.local_addr().is_some()); | ||
| /// ``` | ||
| /// | ||
| /// # Errors | ||
| /// Returns a [`ServerError`] if configuring the listener fails. | ||
| pub fn bind_listener( | ||
| self, | ||
| std: StdTcpListener, | ||
| ) -> Result<WireframeServer<F, T, Bound>, ServerError> { | ||
| std.set_nonblocking(true).map_err(ServerError::Bind)?; | ||
| let tokio = TcpListener::from_std(std).map_err(ServerError::Bind)?; | ||
| Ok(WireframeServer { | ||
| factory: self.factory, | ||
| workers: self.workers, | ||
| on_preamble_success: self.on_preamble_success, | ||
| on_preamble_failure: self.on_preamble_failure, | ||
| ready_tx: self.ready_tx, | ||
| state: Bound { | ||
| listener: Arc::new(tokio), | ||
| }, | ||
| _preamble: PhantomData, | ||
| }) | ||
| } | ||
|
leynos marked this conversation as resolved.
|
||
| } | ||
|
|
||
| impl<F, T> WireframeServer<F, T, Bound> | ||
| where | ||
| F: Fn() -> WireframeApp + Send + Sync + Clone + 'static, | ||
| T: Preamble, | ||
| { | ||
| /// Returns the bound address, or `None` if retrieving it fails. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::net::SocketAddr; | ||
| /// | ||
| /// use wireframe::{app::WireframeApp, server::WireframeServer}; | ||
| /// | ||
| /// let addr: SocketAddr = "127.0.0.1:0".parse().unwrap(); | ||
| /// let server = WireframeServer::new(|| WireframeApp::default()) | ||
| /// .bind(addr) | ||
| /// .expect("bind failed"); | ||
| /// assert!(server.local_addr().is_some()); | ||
| /// ``` | ||
| #[must_use] | ||
| pub fn local_addr(&self) -> Option<SocketAddr> { self.state.listener.local_addr().ok() } | ||
|
|
||
| /// Rebind to a fresh address. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::net::{Ipv4Addr, SocketAddr}; | ||
| /// | ||
| /// use wireframe::{app::WireframeApp, server::WireframeServer}; | ||
| /// | ||
| /// let addr = SocketAddr::from((Ipv4Addr::LOCALHOST, 0)); | ||
| /// let server = WireframeServer::new(|| WireframeApp::default()) | ||
| /// .bind(addr) | ||
| /// .expect("bind failed"); | ||
| /// let addr2 = SocketAddr::from((Ipv4Addr::LOCALHOST, 0)); | ||
| /// let server = server.bind(addr2).expect("rebind failed"); | ||
| /// assert!(server.local_addr().is_some()); | ||
| /// ``` | ||
| /// | ||
| /// # Errors | ||
| /// Returns a [`ServerError`] if binding or configuring the listener fails. | ||
| pub fn bind(self, addr: SocketAddr) -> Result<Self, ServerError> { | ||
| let std = StdTcpListener::bind(addr).map_err(ServerError::Bind)?; | ||
| self.bind_listener(std) | ||
| } | ||
|
|
||
| /// Rebind using an existing `StdTcpListener`. | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use std::net::{Ipv4Addr, SocketAddr, TcpListener as StdTcpListener}; | ||
| /// | ||
| /// use wireframe::{app::WireframeApp, server::WireframeServer}; | ||
| /// | ||
| /// let addr = SocketAddr::from((Ipv4Addr::LOCALHOST, 0)); | ||
| /// let server = WireframeServer::new(|| WireframeApp::default()) | ||
| /// .bind(addr) | ||
| /// .expect("bind failed"); | ||
| /// let std = StdTcpListener::bind(SocketAddr::from((Ipv4Addr::LOCALHOST, 0))).unwrap(); | ||
| /// let server = server.bind_listener(std).expect("rebind failed"); | ||
| /// assert!(server.local_addr().is_some()); | ||
| /// ``` | ||
| /// | ||
| /// # Errors | ||
| /// Returns a [`ServerError`] if configuring the listener fails. | ||
| pub fn bind_listener(self, std: StdTcpListener) -> Result<Self, ServerError> { | ||
| std.set_nonblocking(true).map_err(ServerError::Bind)?; | ||
| let tokio = TcpListener::from_std(std).map_err(ServerError::Bind)?; | ||
| Ok(WireframeServer { | ||
| factory: self.factory, | ||
| workers: self.workers, | ||
| on_preamble_success: self.on_preamble_success, | ||
| on_preamble_failure: self.on_preamble_failure, | ||
| ready_tx: self.ready_tx, | ||
| state: Bound { | ||
| listener: Arc::new(tokio), | ||
| }, | ||
| _preamble: PhantomData, | ||
| }) | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.