mirror of
https://github.com/actix/actix-extras.git
synced 2024-11-23 15:51:06 +01:00
adopt actix-ws crate (#361)
This commit is contained in:
Rob Ede
GitHub
parent
a593a8dc90
commit
6d0ab96dfd
@ -9,6 +9,7 @@ members = [
|
|||||||
"actix-session",
|
"actix-session",
|
||||||
"actix-settings",
|
"actix-settings",
|
||||||
"actix-web-httpauth",
|
"actix-web-httpauth",
|
||||||
|
"actix-ws",
|
||||||
]
|
]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
|
|||||||
@ -186,8 +186,7 @@
|
|||||||
same "printed page" as the copyright notice for easier
|
same "printed page" as the copyright notice for easier
|
||||||
identification within third-party archives.
|
identification within third-party archives.
|
||||||
|
|
||||||
Copyright 2017-NOW Nikolay Kim
|
Copyright 2017-NOW Actix team
|
||||||
Copyright 2017-NOW svartalf and Actix team
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
Copyright (c) 2017 Nikolay Kim
|
Copyright (c) 2023 Actix team
|
||||||
Copyright (c) 2017 svartalf and Actix team
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any
|
Permission is hereby granted, free of charge, to any
|
||||||
person obtaining a copy of this software and associated
|
person obtaining a copy of this software and associated
|
||||||
|
|||||||
@ -19,6 +19,7 @@
|
|||||||
| [actix-session] | [](https://crates.io/crates/actix-session) [](https://deps.rs/crate/actix-session) | Session management. |
|
| [actix-session] | [](https://crates.io/crates/actix-session) [](https://deps.rs/crate/actix-session) | Session management. |
|
||||||
| [actix-settings] | [](https://crates.io/crates/actix-settings) [](https://deps.rs/crate/actix-settings) | Easily manage Actix Web's settings from a TOML file and environment variables. |
|
| [actix-settings] | [](https://crates.io/crates/actix-settings) [](https://deps.rs/crate/actix-settings) | Easily manage Actix Web's settings from a TOML file and environment variables. |
|
||||||
| [actix-web-httpauth] | [](https://crates.io/crates/actix-web-httpauth) [](https://deps.rs/crate/actix-web-httpauth) | HTTP authentication schemes. |
|
| [actix-web-httpauth] | [](https://crates.io/crates/actix-web-httpauth) [](https://deps.rs/crate/actix-web-httpauth) | HTTP authentication schemes. |
|
||||||
|
| [actix-ws] | [][actix-ws] [](https://deps.rs/crate/actix-ws) | WebSockets for Actix Web, without actors. |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@ -30,7 +31,7 @@ These crates are provided by the community.
|
|||||||
| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
|
| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
|
||||||
| [actix-web-lab] | [][actix-web-lab] [](https://deps.rs/crate/actix-web-lab) | Experimental extractors, middleware, and other extras for possible inclusion in Actix Web. |
|
| [actix-web-lab] | [][actix-web-lab] [](https://deps.rs/crate/actix-web-lab) | Experimental extractors, middleware, and other extras for possible inclusion in Actix Web. |
|
||||||
| [actix-multipart-extract] | [][actix-multipart-extract] [](https://deps.rs/crate/actix-multipart-extract) | Better multipart form support for Actix Web. |
|
| [actix-multipart-extract] | [][actix-multipart-extract] [](https://deps.rs/crate/actix-multipart-extract) | Better multipart form support for Actix Web. |
|
||||||
| [actix-form-data] | [][actix-form-data] [](https://deps.rs/crate/actix-form-data) | Multipart form data from actix multipart streams |
|
| [actix-form-data] | [][actix-form-data] [](https://deps.rs/crate/actix-form-data) | Multipart form data from actix multipart streams |
|
||||||
| [actix-governor] | [][actix-governor] [](https://deps.rs/crate/actix-governor) | Rate-limiting backed by governor. |
|
| [actix-governor] | [][actix-governor] [](https://deps.rs/crate/actix-governor) | Rate-limiting backed by governor. |
|
||||||
| [actix-casbin] | [][actix-casbin] [](https://deps.rs/crate/actix-casbin) | Authorization library that supports access control models like ACL, RBAC & ABAC. |
|
| [actix-casbin] | [][actix-casbin] [](https://deps.rs/crate/actix-casbin) | Authorization library that supports access control models like ACL, RBAC & ABAC. |
|
||||||
| [actix-ip-filter] | [][actix-ip-filter] [](https://deps.rs/crate/actix-ip-filter) | IP address filter. Supports glob patterns. |
|
| [actix-ip-filter] | [][actix-ip-filter] [](https://deps.rs/crate/actix-ip-filter) | IP address filter. Supports glob patterns. |
|
||||||
@ -40,7 +41,6 @@ These crates are provided by the community.
|
|||||||
| [actix-web-flash-messages] | [][actix-web-flash-messages] [](https://deps.rs/crate/actix-web-flash-messages) | Support for flash messages/one-time notifications in `actix-web`. |
|
| [actix-web-flash-messages] | [][actix-web-flash-messages] [](https://deps.rs/crate/actix-web-flash-messages) | Support for flash messages/one-time notifications in `actix-web`. |
|
||||||
| [awmp] | [][awmp] [](https://deps.rs/crate/awmp) | An easy to use wrapper around multipart fields for Actix Web. |
|
| [awmp] | [][awmp] [](https://deps.rs/crate/awmp) | An easy to use wrapper around multipart fields for Actix Web. |
|
||||||
| [tracing-actix-web] | [][tracing-actix-web] [](https://deps.rs/crate/tracing-actix-web) | A middleware to collect telemetry data from applications built on top of the Actix Web framework. |
|
| [tracing-actix-web] | [][tracing-actix-web] [](https://deps.rs/crate/tracing-actix-web) | A middleware to collect telemetry data from applications built on top of the Actix Web framework. |
|
||||||
| [actix-ws] | [][actix-ws] [](https://deps.rs/crate/actix-ws) | Actor-less WebSockets for the Actix Runtime. |
|
|
||||||
| [actix-hash] | [][actix-hash] [](https://deps.rs/crate/actix-hash) | Hashing utilities for Actix Web. |
|
| [actix-hash] | [][actix-hash] [](https://deps.rs/crate/actix-hash) | Hashing utilities for Actix Web. |
|
||||||
| [actix-bincode] |  [](https://deps.rs/crate/actix-bincode) | Bincode payload extractor for Actix Web |
|
| [actix-bincode] |  [](https://deps.rs/crate/actix-bincode) | Bincode payload extractor for Actix Web |
|
||||||
| [sentinel-actix] |  [](https://deps.rs/crate/sentinel-actix) | General and flexible protection for Actix Web |
|
| [sentinel-actix] |  [](https://deps.rs/crate/sentinel-actix) | General and flexible protection for Actix Web |
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "actix-web-httpauth"
|
name = "actix-web-httpauth"
|
||||||
version = "0.8.1"
|
version = "0.8.1"
|
||||||
|
description = "HTTP authentication schemes for Actix Web"
|
||||||
|
categories = ["web-programming"]
|
||||||
|
keywords = ["http", "web", "framework", "authentication", "security"]
|
||||||
authors = [
|
authors = [
|
||||||
"svartalf <self@svartalf.info>",
|
"svartalf <self@svartalf.info>",
|
||||||
"Yuki Okushi <huyuumi.dev@gmail.com>",
|
"Yuki Okushi <huyuumi.dev@gmail.com>",
|
||||||
]
|
]
|
||||||
description = "HTTP authentication schemes for Actix Web"
|
|
||||||
keywords = ["http", "web", "framework", "authentication", "security"]
|
|
||||||
homepage = "https://actix.rs"
|
homepage = "https://actix.rs"
|
||||||
repository = "https://github.com/actix/actix-extras.git"
|
repository = "https://github.com/actix/actix-extras"
|
||||||
categories = ["web-programming::http-server"]
|
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
rust-version.workspace = true
|
rust-version.workspace = true
|
||||||
|
|||||||
10
actix-ws/CHANGELOG.md
Normal file
10
actix-ws/CHANGELOG.md
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## Unreleased
|
||||||
|
|
||||||
|
- Remove type parameters from `Session::{text, binary}()` methods, replacing with equivalent `impl Trait` parameters.
|
||||||
|
- `Session::text()` now receives an `impl Into<ByteString>`, making broadcasting text messages more efficient.
|
||||||
|
|
||||||
|
## 0.2.5
|
||||||
|
|
||||||
|
- Adopted into @actix org from <https://git.asonix.dog/asonix/actix-actorless-websockets>.
|
||||||
31
actix-ws/Cargo.toml
Normal file
31
actix-ws/Cargo.toml
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
[package]
|
||||||
|
name = "actix-ws"
|
||||||
|
version = "0.2.0"
|
||||||
|
description = "WebSockets for Actix Web, without actors"
|
||||||
|
categories = ["web-programming::websocket"]
|
||||||
|
keywords = ["actix", "web", "websocket", "websockets", "http"]
|
||||||
|
authors = [
|
||||||
|
"asonix <asonix@asonix.dog>",
|
||||||
|
"Rob Ede <robjtede@icloud.com>",
|
||||||
|
]
|
||||||
|
repository = "https://github.com/actix/actix-extras"
|
||||||
|
license.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
rust-version.workspace = true
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
actix-codec = "0.5"
|
||||||
|
actix-http = { version = "3", default-features = false, features = ["ws"] }
|
||||||
|
actix-web = { version = "4", default-features = false }
|
||||||
|
bytestring = "1"
|
||||||
|
futures-core = "0.3.17"
|
||||||
|
tokio = { version = "1", features = ["sync"] }
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
actix-rt = "2.6"
|
||||||
|
actix-web = "4.0.1"
|
||||||
|
anyhow = "1.0"
|
||||||
|
futures = "0.3"
|
||||||
|
log = "0.4"
|
||||||
|
pretty_env_logger = "0.5"
|
||||||
|
tokio = { version = "1", features = ["sync"] }
|
||||||
1
actix-ws/LICENSE-APACHE
Symbolic link
1
actix-ws/LICENSE-APACHE
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../LICENSE-APACHE
|
||||||
1
actix-ws/LICENSE-MIT
Symbolic link
1
actix-ws/LICENSE-MIT
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
../LICENSE-MIT
|
||||||
74
actix-ws/README.md
Normal file
74
actix-ws/README.md
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
# Actix WS (Next Gen)
|
||||||
|
|
||||||
|
> WebSockets for Actix Web, without actors.
|
||||||
|
|
||||||
|
[](https://crates.io/crates/actix-ws)
|
||||||
|
[](https://docs.rs/actix-ws/0.2.0)
|
||||||
|
|
||||||
|
[](https://deps.rs/crate/actix-ws/0.2.0)
|
||||||
|
|
||||||
|
## Documentation & Resources
|
||||||
|
|
||||||
|
- [API Documentation](https://docs.rs/actix-ws)
|
||||||
|
- [Example Projects](https://github.com/actix/examples/tree/master/websockets)
|
||||||
|
- Minimum Supported Rust Version (MSRV): 1.68
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
```toml
|
||||||
|
# Cargo.toml
|
||||||
|
anyhow = "1"
|
||||||
|
actix-web = "4"
|
||||||
|
actix-ws-ng = "0.3"
|
||||||
|
```
|
||||||
|
|
||||||
|
```rust
|
||||||
|
// main.rs
|
||||||
|
use actix_web::{middleware::Logger, web, App, Error, HttpRequest, HttpResponse, HttpServer};
|
||||||
|
use actix_ws::Message;
|
||||||
|
|
||||||
|
async fn ws(req: HttpRequest, body: web::Payload) -> Result<HttpResponse, Error> {
|
||||||
|
let (response, mut session, mut msg_stream) = actix_ws::handle(&req, body)?;
|
||||||
|
|
||||||
|
actix_rt::spawn(async move {
|
||||||
|
while let Some(Ok(msg)) = msg_stream.next().await {
|
||||||
|
match msg {
|
||||||
|
Message::Ping(bytes) => {
|
||||||
|
if session.pong(&bytes).await.is_err() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::Text(s) => println!("Got text, {}", s),
|
||||||
|
_ => break,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let _ = session.close(None).await;
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(response)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_web::main]
|
||||||
|
async fn main() -> Result<(), anyhow::Error> {
|
||||||
|
HttpServer::new(move || {
|
||||||
|
App::new()
|
||||||
|
.wrap(Logger::default())
|
||||||
|
.route("/ws", web::get().to(ws))
|
||||||
|
})
|
||||||
|
.bind("127.0.0.1:8080")?
|
||||||
|
.run()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
This project is licensed under either of
|
||||||
|
|
||||||
|
- Apache License, Version 2.0, (LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0)
|
||||||
|
- MIT license (LICENSE-MIT or http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
|
at your option.
|
||||||
208
actix-ws/examples/chat.rs
Normal file
208
actix-ws/examples/chat.rs
Normal file
@ -0,0 +1,208 @@
|
|||||||
|
use std::{
|
||||||
|
sync::Arc,
|
||||||
|
time::{Duration, Instant},
|
||||||
|
};
|
||||||
|
|
||||||
|
use actix_web::{middleware::Logger, web, App, HttpRequest, HttpResponse, HttpServer};
|
||||||
|
use actix_ws::{Message, Session};
|
||||||
|
use futures::stream::{FuturesUnordered, StreamExt as _};
|
||||||
|
use log::info;
|
||||||
|
use tokio::sync::Mutex;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
struct Chat {
|
||||||
|
inner: Arc<Mutex<ChatInner>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct ChatInner {
|
||||||
|
sessions: Vec<Session>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Chat {
|
||||||
|
fn new() -> Self {
|
||||||
|
Chat {
|
||||||
|
inner: Arc::new(Mutex::new(ChatInner {
|
||||||
|
sessions: Vec::new(),
|
||||||
|
})),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn insert(&self, session: Session) {
|
||||||
|
self.inner.lock().await.sessions.push(session);
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn send(&self, msg: String) {
|
||||||
|
let mut inner = self.inner.lock().await;
|
||||||
|
let mut unordered = FuturesUnordered::new();
|
||||||
|
|
||||||
|
for mut session in inner.sessions.drain(..) {
|
||||||
|
let msg = msg.clone();
|
||||||
|
unordered.push(async move {
|
||||||
|
let res = session.text(msg).await;
|
||||||
|
res.map(|_| session).map_err(|_| info!("Dropping session"))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
while let Some(res) = unordered.next().await {
|
||||||
|
if let Ok(session) = res {
|
||||||
|
inner.sessions.push(session);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn ws(
|
||||||
|
req: HttpRequest,
|
||||||
|
body: web::Payload,
|
||||||
|
chat: web::Data<Chat>,
|
||||||
|
) -> Result<HttpResponse, actix_web::Error> {
|
||||||
|
let (response, mut session, mut stream) = actix_ws::handle(&req, body)?;
|
||||||
|
|
||||||
|
chat.insert(session.clone()).await;
|
||||||
|
info!("Inserted session");
|
||||||
|
|
||||||
|
let alive = Arc::new(Mutex::new(Instant::now()));
|
||||||
|
|
||||||
|
let mut session2 = session.clone();
|
||||||
|
let alive2 = alive.clone();
|
||||||
|
actix_rt::spawn(async move {
|
||||||
|
let mut interval = actix_rt::time::interval(Duration::from_secs(5));
|
||||||
|
loop {
|
||||||
|
interval.tick().await;
|
||||||
|
if session2.ping(b"").await.is_err() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if Instant::now().duration_since(*alive2.lock().await) > Duration::from_secs(10) {
|
||||||
|
let _ = session2.close(None).await;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
actix_rt::spawn(async move {
|
||||||
|
while let Some(Ok(msg)) = stream.next().await {
|
||||||
|
match msg {
|
||||||
|
Message::Ping(bytes) => {
|
||||||
|
if session.pong(&bytes).await.is_err() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::Text(s) => {
|
||||||
|
info!("Relaying text, {}", s);
|
||||||
|
let s: &str = s.as_ref();
|
||||||
|
chat.send(s.into()).await;
|
||||||
|
}
|
||||||
|
Message::Close(reason) => {
|
||||||
|
let _ = session.close(reason).await;
|
||||||
|
info!("Got close, bailing");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Message::Continuation(_) => {
|
||||||
|
let _ = session.close(None).await;
|
||||||
|
info!("Got continuation, bailing");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Message::Pong(_) => {
|
||||||
|
*alive.lock().await = Instant::now();
|
||||||
|
}
|
||||||
|
_ => (),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
let _ = session.close(None).await;
|
||||||
|
});
|
||||||
|
info!("Spawned");
|
||||||
|
|
||||||
|
Ok(response)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn index() -> HttpResponse {
|
||||||
|
let s = r#"
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<title>Chat</title>
|
||||||
|
<script>
|
||||||
|
function onLoad() {
|
||||||
|
console.log("BOOTING");
|
||||||
|
const socket = new WebSocket("ws://localhost:8080/ws");
|
||||||
|
const input = document.getElementById("chat-input");
|
||||||
|
const logs = document.getElementById("chat-logs");
|
||||||
|
|
||||||
|
if (!input || !logs) {
|
||||||
|
alert("Couldn't find required elements");
|
||||||
|
console.err("Couldn't find required elements");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
input.addEventListener("keyup", event => {
|
||||||
|
if (event.isComposing) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (event.key != "Enter") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
socket.send(input.value);
|
||||||
|
input.value = "";
|
||||||
|
}, false);
|
||||||
|
|
||||||
|
socket.onmessage = event => {
|
||||||
|
const newNode = document.createElement("li");
|
||||||
|
newNode.textContent = event.data;
|
||||||
|
|
||||||
|
let firstChild = null;
|
||||||
|
for (const n of logs.childNodes.values()) {
|
||||||
|
if (n.nodeType == 1) {
|
||||||
|
firstChild = n;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (firstChild) {
|
||||||
|
logs.insertBefore(newNode, firstChild);
|
||||||
|
} else {
|
||||||
|
logs.appendChild(newNode);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener("beforeunload", () => { socket.close() });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (document.readyState === "complete") {
|
||||||
|
onLoad();
|
||||||
|
} else {
|
||||||
|
document.addEventListener("DOMContentLoaded", onLoad, false);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<input id="chat-input" type="test" />
|
||||||
|
<ul id="chat-logs">
|
||||||
|
</ul>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
"#;
|
||||||
|
|
||||||
|
HttpResponse::Ok().content_type("text/html").body(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[actix_rt::main]
|
||||||
|
async fn main() -> Result<(), anyhow::Error> {
|
||||||
|
std::env::set_var("RUST_LOG", "info");
|
||||||
|
pretty_env_logger::init();
|
||||||
|
let chat = Chat::new();
|
||||||
|
|
||||||
|
HttpServer::new(move || {
|
||||||
|
App::new()
|
||||||
|
.wrap(Logger::default())
|
||||||
|
.app_data(web::Data::new(chat.clone()))
|
||||||
|
.route("/", web::get().to(index))
|
||||||
|
.route("/ws", web::get().to(ws))
|
||||||
|
})
|
||||||
|
.bind("127.0.0.1:8080")?
|
||||||
|
.run()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
183
actix-ws/src/fut.rs
Normal file
183
actix-ws/src/fut.rs
Normal file
@ -0,0 +1,183 @@
|
|||||||
|
use std::{
|
||||||
|
collections::VecDeque,
|
||||||
|
future::poll_fn,
|
||||||
|
io,
|
||||||
|
pin::Pin,
|
||||||
|
task::{Context, Poll},
|
||||||
|
};
|
||||||
|
|
||||||
|
use actix_codec::{Decoder, Encoder};
|
||||||
|
use actix_http::{
|
||||||
|
ws::{Codec, Frame, Message, ProtocolError},
|
||||||
|
Payload,
|
||||||
|
};
|
||||||
|
use actix_web::{
|
||||||
|
web::{Bytes, BytesMut},
|
||||||
|
Error,
|
||||||
|
};
|
||||||
|
use futures_core::stream::Stream;
|
||||||
|
use tokio::sync::mpsc::Receiver;
|
||||||
|
|
||||||
|
/// A response body for Websocket HTTP Requests
|
||||||
|
pub struct StreamingBody {
|
||||||
|
session_rx: Receiver<Message>,
|
||||||
|
|
||||||
|
messages: VecDeque<Message>,
|
||||||
|
buf: BytesMut,
|
||||||
|
codec: Codec,
|
||||||
|
closing: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A stream of Messages from a websocket client
|
||||||
|
///
|
||||||
|
/// Messages can be accessed via the stream's `.next()` method
|
||||||
|
pub struct MessageStream {
|
||||||
|
payload: Payload,
|
||||||
|
|
||||||
|
messages: VecDeque<Message>,
|
||||||
|
buf: BytesMut,
|
||||||
|
codec: Codec,
|
||||||
|
closing: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl StreamingBody {
|
||||||
|
pub(super) fn new(session_rx: Receiver<Message>) -> Self {
|
||||||
|
StreamingBody {
|
||||||
|
session_rx,
|
||||||
|
messages: VecDeque::new(),
|
||||||
|
buf: BytesMut::new(),
|
||||||
|
codec: Codec::new(),
|
||||||
|
closing: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MessageStream {
|
||||||
|
pub(super) fn new(payload: Payload) -> Self {
|
||||||
|
MessageStream {
|
||||||
|
payload,
|
||||||
|
messages: VecDeque::new(),
|
||||||
|
buf: BytesMut::new(),
|
||||||
|
codec: Codec::new(),
|
||||||
|
closing: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Wait for the next item from the message stream
|
||||||
|
///
|
||||||
|
/// ```rust,ignore
|
||||||
|
/// while let Some(Ok(msg)) = stream.recv().await {
|
||||||
|
/// // handle message
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
pub async fn recv(&mut self) -> Option<Result<Message, ProtocolError>> {
|
||||||
|
poll_fn(|cx| Pin::new(&mut *self).poll_next(cx)).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Stream for StreamingBody {
|
||||||
|
type Item = Result<Bytes, Error>;
|
||||||
|
|
||||||
|
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
||||||
|
let this = self.get_mut();
|
||||||
|
|
||||||
|
if this.closing {
|
||||||
|
return Poll::Ready(None);
|
||||||
|
}
|
||||||
|
|
||||||
|
loop {
|
||||||
|
match Pin::new(&mut this.session_rx).poll_recv(cx) {
|
||||||
|
Poll::Ready(Some(msg)) => {
|
||||||
|
this.messages.push_back(msg);
|
||||||
|
}
|
||||||
|
Poll::Ready(None) => {
|
||||||
|
this.closing = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Poll::Pending => break,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
while let Some(msg) = this.messages.pop_front() {
|
||||||
|
if let Err(e) = this.codec.encode(msg, &mut this.buf) {
|
||||||
|
return Poll::Ready(Some(Err(e.into())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !this.buf.is_empty() {
|
||||||
|
return Poll::Ready(Some(Ok(this.buf.split().freeze())));
|
||||||
|
}
|
||||||
|
|
||||||
|
Poll::Pending
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Stream for MessageStream {
|
||||||
|
type Item = Result<Message, ProtocolError>;
|
||||||
|
|
||||||
|
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
||||||
|
let this = self.get_mut();
|
||||||
|
|
||||||
|
// Return the first message in the queue if one exists
|
||||||
|
//
|
||||||
|
// This is faster than polling and parsing
|
||||||
|
if let Some(msg) = this.messages.pop_front() {
|
||||||
|
return Poll::Ready(Some(Ok(msg)));
|
||||||
|
}
|
||||||
|
|
||||||
|
if !this.closing {
|
||||||
|
// Read in bytes until there's nothing left to read
|
||||||
|
loop {
|
||||||
|
match Pin::new(&mut this.payload).poll_next(cx) {
|
||||||
|
Poll::Ready(Some(Ok(bytes))) => {
|
||||||
|
this.buf.extend_from_slice(&bytes);
|
||||||
|
}
|
||||||
|
Poll::Ready(Some(Err(e))) => {
|
||||||
|
return Poll::Ready(Some(Err(ProtocolError::Io(io::Error::new(
|
||||||
|
io::ErrorKind::Other,
|
||||||
|
e.to_string(),
|
||||||
|
)))));
|
||||||
|
}
|
||||||
|
Poll::Ready(None) => {
|
||||||
|
this.closing = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Poll::Pending => break,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create messages until there's no more bytes left
|
||||||
|
while let Some(frame) = this.codec.decode(&mut this.buf)? {
|
||||||
|
let message = match frame {
|
||||||
|
Frame::Text(bytes) => {
|
||||||
|
let s = std::str::from_utf8(&bytes)
|
||||||
|
.map_err(|e| {
|
||||||
|
ProtocolError::Io(io::Error::new(io::ErrorKind::Other, e.to_string()))
|
||||||
|
})?
|
||||||
|
.to_string();
|
||||||
|
Message::Text(s.into())
|
||||||
|
}
|
||||||
|
Frame::Binary(bytes) => Message::Binary(bytes),
|
||||||
|
Frame::Ping(bytes) => Message::Ping(bytes),
|
||||||
|
Frame::Pong(bytes) => Message::Pong(bytes),
|
||||||
|
Frame::Close(reason) => Message::Close(reason),
|
||||||
|
Frame::Continuation(item) => Message::Continuation(item),
|
||||||
|
};
|
||||||
|
|
||||||
|
this.messages.push_back(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return the first message in the queue
|
||||||
|
if let Some(msg) = this.messages.pop_front() {
|
||||||
|
return Poll::Ready(Some(Ok(msg)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we've exhausted our message queue and we're closing, close the stream
|
||||||
|
if this.closing {
|
||||||
|
return Poll::Ready(None);
|
||||||
|
}
|
||||||
|
|
||||||
|
Poll::Pending
|
||||||
|
}
|
||||||
|
}
|
||||||
84
actix-ws/src/lib.rs
Normal file
84
actix-ws/src/lib.rs
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
//! WebSockets for Actix Web, without actors.
|
||||||
|
//!
|
||||||
|
//! For usage, see documentation on [`handle()`].
|
||||||
|
|
||||||
|
#![deny(rust_2018_idioms, nonstandard_style, future_incompatible)]
|
||||||
|
#![warn(missing_docs)]
|
||||||
|
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
|
||||||
|
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
|
||||||
|
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
|
||||||
|
|
||||||
|
pub use actix_http::ws::{CloseCode, CloseReason, Message, ProtocolError};
|
||||||
|
use actix_http::{
|
||||||
|
body::{BodyStream, MessageBody},
|
||||||
|
ws::handshake,
|
||||||
|
};
|
||||||
|
use actix_web::{web, HttpRequest, HttpResponse};
|
||||||
|
use tokio::sync::mpsc::channel;
|
||||||
|
|
||||||
|
mod fut;
|
||||||
|
mod session;
|
||||||
|
|
||||||
|
pub use self::{
|
||||||
|
fut::{MessageStream, StreamingBody},
|
||||||
|
session::{Closed, Session},
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Begin handling websocket traffic
|
||||||
|
///
|
||||||
|
/// ```no_run
|
||||||
|
/// use actix_web::{middleware::Logger, web, App, Error, HttpRequest, HttpResponse, HttpServer};
|
||||||
|
/// use actix_ws::Message;
|
||||||
|
/// use futures::stream::StreamExt as _;
|
||||||
|
///
|
||||||
|
/// async fn ws(req: HttpRequest, body: web::Payload) -> Result<HttpResponse, Error> {
|
||||||
|
/// let (response, mut session, mut msg_stream) = actix_ws::handle(&req, body)?;
|
||||||
|
///
|
||||||
|
/// actix_rt::spawn(async move {
|
||||||
|
/// while let Some(Ok(msg)) = msg_stream.next().await {
|
||||||
|
/// match msg {
|
||||||
|
/// Message::Ping(bytes) => {
|
||||||
|
/// if session.pong(&bytes).await.is_err() {
|
||||||
|
/// return;
|
||||||
|
/// }
|
||||||
|
/// }
|
||||||
|
/// Message::Text(s) => println!("Got text, {}", s),
|
||||||
|
/// _ => break,
|
||||||
|
/// }
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// let _ = session.close(None).await;
|
||||||
|
/// });
|
||||||
|
///
|
||||||
|
/// Ok(response)
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// #[actix_rt::main]
|
||||||
|
/// async fn main() -> Result<(), anyhow::Error> {
|
||||||
|
/// HttpServer::new(move || {
|
||||||
|
/// App::new()
|
||||||
|
/// .wrap(Logger::default())
|
||||||
|
/// .route("/ws", web::get().to(ws))
|
||||||
|
/// })
|
||||||
|
/// .bind("127.0.0.1:8080")?
|
||||||
|
/// .run()
|
||||||
|
/// .await?;
|
||||||
|
///
|
||||||
|
/// Ok(())
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
pub fn handle(
|
||||||
|
req: &HttpRequest,
|
||||||
|
body: web::Payload,
|
||||||
|
) -> Result<(HttpResponse, Session, MessageStream), actix_web::Error> {
|
||||||
|
let mut response = handshake(req.head())?;
|
||||||
|
let (tx, rx) = channel(32);
|
||||||
|
|
||||||
|
Ok((
|
||||||
|
response
|
||||||
|
.message_body(BodyStream::new(StreamingBody::new(rx)).boxed())?
|
||||||
|
.into(),
|
||||||
|
Session::new(tx),
|
||||||
|
MessageStream::new(body.into_inner()),
|
||||||
|
))
|
||||||
|
}
|
||||||
143
actix-ws/src/session.rs
Normal file
143
actix-ws/src/session.rs
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
use std::sync::{
|
||||||
|
atomic::{AtomicBool, Ordering},
|
||||||
|
Arc,
|
||||||
|
};
|
||||||
|
|
||||||
|
use actix_http::ws::{CloseReason, Message};
|
||||||
|
use actix_web::web::Bytes;
|
||||||
|
use bytestring::ByteString;
|
||||||
|
use tokio::sync::mpsc::Sender;
|
||||||
|
|
||||||
|
/// A handle into the websocket session.
|
||||||
|
///
|
||||||
|
/// This type can be used to send messages into the websocket.
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Session {
|
||||||
|
inner: Option<Sender<Message>>,
|
||||||
|
closed: Arc<AtomicBool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The error representing a closed websocket session
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Closed;
|
||||||
|
|
||||||
|
impl std::fmt::Display for Closed {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
write!(f, "Session is closed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::error::Error for Closed {}
|
||||||
|
|
||||||
|
impl Session {
|
||||||
|
pub(super) fn new(inner: Sender<Message>) -> Self {
|
||||||
|
Session {
|
||||||
|
inner: Some(inner),
|
||||||
|
closed: Arc::new(AtomicBool::new(false)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pre_check(&mut self) {
|
||||||
|
if self.closed.load(Ordering::Relaxed) {
|
||||||
|
self.inner.take();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Send text into the websocket
|
||||||
|
///
|
||||||
|
/// ```rust,ignore
|
||||||
|
/// if session.text("Some text").await.is_err() {
|
||||||
|
/// // session closed
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
pub async fn text(&mut self, msg: impl Into<ByteString>) -> Result<(), Closed> {
|
||||||
|
self.pre_check();
|
||||||
|
if let Some(inner) = self.inner.as_mut() {
|
||||||
|
inner
|
||||||
|
.send(Message::Text(msg.into()))
|
||||||
|
.await
|
||||||
|
.map_err(|_| Closed)
|
||||||
|
} else {
|
||||||
|
Err(Closed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Send raw bytes into the websocket
|
||||||
|
///
|
||||||
|
/// ```rust,ignore
|
||||||
|
/// if session.binary(b"some bytes").await.is_err() {
|
||||||
|
/// // session closed
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
pub async fn binary(&mut self, msg: impl Into<Bytes>) -> Result<(), Closed> {
|
||||||
|
self.pre_check();
|
||||||
|
if let Some(inner) = self.inner.as_mut() {
|
||||||
|
inner
|
||||||
|
.send(Message::Binary(msg.into()))
|
||||||
|
.await
|
||||||
|
.map_err(|_| Closed)
|
||||||
|
} else {
|
||||||
|
Err(Closed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Ping the client
|
||||||
|
///
|
||||||
|
/// For many applications, it will be important to send regular pings to keep track of if the
|
||||||
|
/// client has disconnected
|
||||||
|
///
|
||||||
|
/// ```rust,ignore
|
||||||
|
/// if session.ping(b"").await.is_err() {
|
||||||
|
/// // session is closed
|
||||||
|
/// }
|
||||||
|
/// ```
|
||||||
|
pub async fn ping(&mut self, msg: &[u8]) -> Result<(), Closed> {
|
||||||
|
self.pre_check();
|
||||||
|
if let Some(inner) = self.inner.as_mut() {
|
||||||
|
inner
|
||||||
|
.send(Message::Ping(Bytes::copy_from_slice(msg)))
|
||||||
|
.await
|
||||||
|
.map_err(|_| Closed)
|
||||||
|
} else {
|
||||||
|
Err(Closed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Pong the client
|
||||||
|
///
|
||||||
|
/// ```rust,ignore
|
||||||
|
/// match msg {
|
||||||
|
/// Message::Ping(bytes) => {
|
||||||
|
/// let _ = session.pong(&bytes).await;
|
||||||
|
/// }
|
||||||
|
/// _ => (),
|
||||||
|
/// }
|
||||||
|
pub async fn pong(&mut self, msg: &[u8]) -> Result<(), Closed> {
|
||||||
|
self.pre_check();
|
||||||
|
if let Some(inner) = self.inner.as_mut() {
|
||||||
|
inner
|
||||||
|
.send(Message::Pong(Bytes::copy_from_slice(msg)))
|
||||||
|
.await
|
||||||
|
.map_err(|_| Closed)
|
||||||
|
} else {
|
||||||
|
Err(Closed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Send a close message, and consume the session
|
||||||
|
///
|
||||||
|
/// All clones will return `Err(Closed)` if used after this call
|
||||||
|
///
|
||||||
|
/// ```rust,ignore
|
||||||
|
/// session.close(None).await
|
||||||
|
/// ```
|
||||||
|
pub async fn close(mut self, reason: Option<CloseReason>) -> Result<(), Closed> {
|
||||||
|
self.pre_check();
|
||||||
|
if let Some(inner) = self.inner.take() {
|
||||||
|
self.closed.store(true, Ordering::Relaxed);
|
||||||
|
inner.send(Message::Close(reason)).await.map_err(|_| Closed)
|
||||||
|
} else {
|
||||||
|
Err(Closed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user