actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-06-28 18:00:37 +02:00
Code Issues Releases Wiki Activity

update all websocket examples to v4

Browse Source
This commit is contained in:
Rob Ede
2022-02-18 01:44:53 +00:00
parent 1b23e3ff3d
commit 4d8573c3fe
40 changed files with 1340 additions and 1682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
websockets/chat-broker/src/main.rs
View File

@ -1,7 +1,7 @@
use log::info;
use actix_files::Files;
use actix_web::{web, App, Error, HttpRequest, HttpResponse, HttpServer};
use actix_files::{Files, NamedFile};
use actix_web::{
middleware::Logger, web, App, Error, HttpRequest, HttpServer, Responder,
};
use actix_web_actors::ws;
mod message;
@ -10,28 +10,32 @@ mod session;
use session::WsChatSession;
async fn chat_route(
async fn index() -> impl Responder {
NamedFile::open_async("./static/index.html").await.unwrap()
}
async fn chat_ws(
req: HttpRequest,
stream: web::Payload,
) -> Result<HttpResponse, Error> {
) -> Result<impl Responder, Error> {
ws::start(WsChatSession::default(), &req, stream)
}
#[actix_web::main]
async fn main() -> std::io::Result<()> {
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
.init();
env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
let addr = ("127.0.0.1", 8080);
log::info!("starting HTTP server at http://localhost:8080");
let srv = HttpServer::new(move || {
HttpServer::new(move || {
App::new()
.service(web::resource("/ws/").to(chat_route))
.service(Files::new("/", "./static/").index_file("index.html"))
.service(web::resource("/").to(index))
.service(web::resource("/ws").to(chat_ws))
.service(Files::new("/static", "./static"))
.wrap(Logger::default())
})
.bind(&addr)?;
info!("Starting http server: {}", &addr);
srv.run().await
.workers(2)
.bind(("127.0.0.1", 8080))?
.run()
.await
}

4
websockets/chat-broker/src/server.rs
View File

@ -1,8 +1,8 @@
use std::collections::HashMap;
use actix::prelude::*;
use actix_broker::BrokerSubscribe;
use std::collections::HashMap;
use crate::message::{ChatMessage, JoinRoom, LeaveRoom, ListRooms, SendMessage};
type Client = Recipient<ChatMessage>;

15
websockets/chat-broker/src/session.rs
View File

@ -1,12 +1,11 @@
use log::{debug, info};
use actix::fut;
use actix::prelude::*;
use actix::{fut, prelude::*};
use actix_broker::BrokerIssue;
use actix_web_actors::ws;
use crate::message::{ChatMessage, JoinRoom, LeaveRoom, ListRooms, SendMessage};
use crate::server::WsChatServer;
use crate::{
message::{ChatMessage, JoinRoom, LeaveRoom, ListRooms, SendMessage},
server::WsChatServer,
};
#[derive(Default)]
pub struct WsChatSession {
@ -84,7 +83,7 @@ impl Actor for WsChatSession {
}
fn stopped(&mut self, _ctx: &mut Self::Context) {
info!(
log::info!(
"WsChatSession closed for {}({}) in room {}",
self.name.clone().unwrap_or_else(|| "anon".to_string()),
self.id,
@ -115,7 +114,7 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for WsChatSession {
Ok(msg) => msg,
};
debug!("WEBSOCKET MESSAGE: {:?}", msg);
log::debug!("WEBSOCKET MESSAGE: {:?}", msg);
match msg {
ws::Message::Text(text) => {