-
Notifications
You must be signed in to change notification settings - Fork 13
Axum integration #39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Axum integration #39
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| [package] | ||
| name = "ratchet_axum" | ||
| description = "Axum Integration for Ratchet" | ||
| readme = "README.md" | ||
| repository = "https://github.com/swimos/ratchet/" | ||
| version.workspace = true | ||
| edition.workspace = true | ||
| authors.workspace = true | ||
| license.workspace = true | ||
| categories.workspace = true | ||
|
|
||
|
|
||
| [dependencies] | ||
| ratchet_core = { version = "1.0.3", path = "../ratchet_core" } | ||
| ratchet_ext = { version = "1.0.3", path = "../ratchet_ext" } | ||
| hyper = { workspace = true } | ||
| axum-core = { workspace = true } | ||
| eyre = { workspace = true} | ||
| hyper-util = { workspace = true , features = ["tokio"]} | ||
| pin-project = { workspace = true } | ||
| async-trait = { workspace = true } | ||
| base64 = "0.22.1" | ||
| http = "1.1.0" | ||
| sha1 = "0.10.1" | ||
|
clarkohw marked this conversation as resolved.
Outdated
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| // Port of hyper_tunstenite for fastwebsockets. | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I can understand the rationale behind this but I don't believe that this is required as it's a fairly simple integration and there isn't really another way of integrating it into Axum.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Some module-level documentation would be good for this. Coupled with an example of it |
||
| // https://github.com/de-vri-es/hyper-tungstenite-rs | ||
| // | ||
| // Copyright 2021, Maarten de Vries maarten@de-vri.es | ||
| // BSD 2-Clause "Simplified" License | ||
| // | ||
| // Copyright 2023 Divy Srivastava <dj.srivastava23@gmail.com> | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| //todo missing docs | ||
|
|
||
| #![deny( | ||
| // missing_docs, | ||
| missing_copy_implementations, | ||
| missing_debug_implementations, | ||
| trivial_numeric_casts, | ||
| unstable_features, | ||
| unused_must_use, | ||
| unused_mut, | ||
| unused_imports, | ||
| unused_import_braces | ||
| )] | ||
|
|
||
| use std::pin::Pin; | ||
| use std::task::Context; | ||
| use std::task::Poll; | ||
|
|
||
| use axum_core::body::Body; | ||
| use base64; | ||
| use base64::engine::general_purpose::STANDARD; | ||
| use base64::Engine; | ||
| use eyre::Report; | ||
| use http::HeaderMap; | ||
| use hyper::Response; | ||
| use hyper_util::rt::TokioIo; | ||
| use pin_project::pin_project; | ||
| use sha1::Digest; | ||
| use sha1::Sha1; | ||
|
|
||
| type Error = Report; | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct IncomingUpgrade { | ||
|
clarkohw marked this conversation as resolved.
Outdated
|
||
| key: String, | ||
| headers: HeaderMap, | ||
| on_upgrade: hyper::upgrade::OnUpgrade, | ||
| pub permessage_deflate: bool, | ||
| } | ||
|
|
||
| impl IncomingUpgrade { | ||
| pub fn upgrade(self) -> Result<(Response<Body>, UpgradeFut), Error> { | ||
|
clarkohw marked this conversation as resolved.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it would be more ergonomic if this was inverted a bit. It would also be safer as it ensures that any contracts made during the upgrade are upheld as we create the Something like this: pub fn upgrade<E,F, Fut>(self, f:F) -> Response<Body>
where
F: FnOnce(UpgradedServer<TokioIo<hyper::upgrade::Upgraded>, E>) -> Fut,
Fut: Future<Output=()>,
E: Extension,
{
// await the upgrade future and spawn the user's handler after creating the WebSocket.
}Then you could use it as follows: async fn ws_handler<E>(incoming_upgrade: IncomingUpgrade, state: State<E>) -> impl IntoResponse {
incoming_upgrade.upgrade(|mut upgraded| async {
let UpgradedServer {
request,
websocket,
subprotocol,
} = upgraded;
let mut buf = BytesMut::new();
loop {
match websocket.read(&mut buf).await.unwrap() {
Message::Text => {
websocket.write(&mut buf, PayloadType::Text).await.unwrap();
buf.clear();
}
_ => break,
}
}
})
}
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @SirCipher I am trying to implement the upgrade like this but having trouble because wondering if you have any advice here |
||
| let mut builder = Response::builder() | ||
| .status(hyper::StatusCode::SWITCHING_PROTOCOLS) | ||
| .header(hyper::header::CONNECTION, "upgrade") | ||
| .header(hyper::header::UPGRADE, "websocket") | ||
|
clarkohw marked this conversation as resolved.
Outdated
|
||
| .header("Sec-WebSocket-Accept", self.key); | ||
|
clarkohw marked this conversation as resolved.
Outdated
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A user needs to be able to specify |
||
|
|
||
| if self.permessage_deflate { | ||
| builder = builder.header("Sec-WebSocket-Extensions", "permessage-deflate"); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This isn't quite correct. If the client has sent a What it would be worth doing, is providing an https://docs.rs/ratchet_ext/latest/ratchet_ext/trait.ExtensionProvider.html which a user may specify to the Axum Router or the handler may capture it. Then you can use this provider to perform the extension negotiation using https://docs.rs/ratchet_ext/latest/ratchet_ext/trait.ExtensionProvider.html#tymethod.negotiate_server. Also, so it's tidier, you can use |
||
| } | ||
|
|
||
| let response = builder | ||
| .body(Body::default()) | ||
| .expect("bug: failed to build response"); | ||
|
|
||
| let stream = UpgradeFut { | ||
| inner: self.on_upgrade, | ||
| headers: self.headers, | ||
| }; | ||
|
|
||
| Ok((response, stream)) | ||
| } | ||
| } | ||
|
|
||
| #[async_trait::async_trait] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seeing as this is the only place that |
||
| impl<S> axum_core::extract::FromRequestParts<S> for IncomingUpgrade | ||
| where | ||
| S: Sync, | ||
| { | ||
| type Rejection = hyper::StatusCode; | ||
|
|
||
| async fn from_request_parts( | ||
| parts: &mut http::request::Parts, | ||
| _state: &S, | ||
| ) -> Result<Self, Self::Rejection> { | ||
| let key = parts | ||
| .headers | ||
| .get("Sec-WebSocket-Key") | ||
| .ok_or(hyper::StatusCode::BAD_REQUEST)?; | ||
| if parts | ||
| .headers | ||
| .get("Sec-WebSocket-Version") | ||
| .map(|v| v.as_bytes()) | ||
| != Some(b"13".as_slice()) | ||
|
clarkohw marked this conversation as resolved.
Outdated
|
||
| { | ||
| return Err(hyper::StatusCode::BAD_REQUEST); | ||
| } | ||
|
|
||
| let permessage_deflate = parts | ||
| .headers | ||
| .get("Sec-WebSocket-Extensions") | ||
| .map(|val| { | ||
| val.to_str() | ||
| .unwrap_or_default() | ||
| .to_lowercase() | ||
| .contains("permessage-deflate") | ||
| }) | ||
| .unwrap_or(false); | ||
|
|
||
| let on_upgrade = parts | ||
| .extensions | ||
| .remove::<hyper::upgrade::OnUpgrade>() | ||
| .ok_or(hyper::StatusCode::BAD_REQUEST)?; | ||
| Ok(Self { | ||
| on_upgrade, | ||
| key: sec_websocket_protocol(key.as_bytes()), | ||
| headers: parts.headers.clone(), | ||
| permessage_deflate, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| /// A future that resolves to a websocket stream when the associated HTTP upgrade completes. | ||
| #[pin_project] | ||
| #[derive(Debug)] | ||
| pub struct UpgradeFut { | ||
| #[pin] | ||
| inner: hyper::upgrade::OnUpgrade, | ||
| pub headers: HeaderMap, | ||
| } | ||
|
|
||
| impl std::future::Future for UpgradeFut { | ||
| type Output = Result<TokioIo<hyper::upgrade::Upgraded>, Error>; | ||
|
|
||
| fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> { | ||
| let this = self.project(); | ||
| let upgraded = match this.inner.poll(cx) { | ||
| Poll::Pending => return Poll::Pending, | ||
| Poll::Ready(x) => x, | ||
| }; | ||
| Poll::Ready(upgraded.map(|u| TokioIo::new(u)).map_err(|e| e.into())) | ||
| } | ||
| } | ||
|
|
||
| fn sec_websocket_protocol(key: &[u8]) -> String { | ||
| let mut sha1 = Sha1::new(); | ||
| sha1.update(key); | ||
| sha1.update(b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"); // magic string | ||
| let result = sha1.finalize(); | ||
| STANDARD.encode(&result[..]) | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| use axum::{response::IntoResponse, routing::get, Router}; | ||
| use bytes::BytesMut; | ||
| use ratchet_axum::{IncomingUpgrade, UpgradeFut}; | ||
| use ratchet_core::{Message, NegotiatedExtension, NoExt, PayloadType, Role, WebSocketConfig}; | ||
|
|
||
| #[tokio::main] | ||
| async fn main() { | ||
| let app = Router::new().route("/", get(ws_handler)); | ||
|
|
||
| let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap(); | ||
| axum::serve(listener, app).await.unwrap(); | ||
| } | ||
|
|
||
| async fn handle_client(fut: UpgradeFut) { | ||
| let io = fut.await.unwrap(); | ||
| let mut websocket = ratchet_rs::WebSocket::from_upgraded( | ||
| WebSocketConfig::default(), | ||
| io, | ||
| NegotiatedExtension::from(NoExt), | ||
| BytesMut::new(), | ||
| Role::Server, | ||
| ); | ||
| let mut buf = BytesMut::new(); | ||
|
|
||
| loop { | ||
| match websocket.read(&mut buf).await.unwrap() { | ||
| Message::Text => { | ||
| websocket.write(&mut buf, PayloadType::Text).await.unwrap(); | ||
| buf.clear(); | ||
| } | ||
| _ => break, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| async fn ws_handler(incoming_upgrade: IncomingUpgrade) -> impl IntoResponse { | ||
| let (response, fut) = incoming_upgrade.upgrade().unwrap(); | ||
| tokio::task::spawn(async move { handle_client(fut).await }); | ||
| response | ||
| } |
Uh oh!
There was an error while loading. Please reload this page.