feat(service): add adapter for tower services #46
Conversation
This file contains 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
davidpdrsn
commented
Nov 10, 2023
src/server/conn/auto.rs
Outdated
Comment on lines
103
to
121
| let (version, io) = read_version(io).await?; | ||
| let io = TokioIo::new(io); | ||
| match version { | ||
| Version::H1 => { | ||
| self.http1 | ||
| .serve_connection(io, TowerToHyperService::new(service)) | ||
| .await? | ||
| } | ||
| Version::H2 => { | ||
| self.http2 | ||
| .serve_connection(io, TowerToHyperService::new(service)) | ||
| .await? | ||
| } | ||
| } | ||
|
|
||
| Ok(()) |
There was a problem hiding this comment.
Ideally we'd just call serve_connection but that requires S: 'static. Not totally sure why that is. Copy-pasting the impl doesn't require that 🤔
davidpdrsn
force-pushed
the
serve-tower
branch
2 times, most recently
from
82fd274 to
b4c9203
Compare
davidpdrsn
commented
Nov 10, 2023
Comment on lines
+11
to
+14
| #[cfg(all( | ||
| any(feature = "http1", feature = "http2"), | ||
| any(feature = "server", feature = "client") | ||
| ))] |
There was a problem hiding this comment.
Perhaps hyper should have a service feature so we don't need to do stuff like this.
davidpdrsn
force-pushed
the
serve-tower
branch
from
b4c9203 to
12d7a60
Compare
davidpdrsn
commented
Nov 11, 2023
| any(feature = "http1", feature = "http2"), | ||
| any(feature = "server", feature = "client") | ||
| ))] | ||
| pub async fn serve_connection_tower<I, S, B>(&self, io: I, service: S) -> Result<()> |
There was a problem hiding this comment.
Been thinking that axum also needs a version that uses MakeService for https://docs.rs/axum/latest/axum/struct.Router.html#method.into_make_service_with_connect_info
3 tasks
|
I wanna do some more thinking about how to best do this. So I'll close this PR for now and submit PRs with smaller pieces. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This adds
TowerToHyperServicewhich converts a tower service into a hyper service.Builder::serve_connection_towerandBuilder::serve_connection_with_upgrades_towerfor serving a tower service directly. The adapter will be applied internally.