grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Formatting fixes.

Browse source
This commit is contained in:
Dessalines 2019-07-19 19:56:40 -07:00
parent a6407c92be
commit 9bf561b7c2
1 changed files with 148 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

296
server/src/main.rs
View file

@ -20,194 +20,194 @@ const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
/// Entry point for our route /// Entry point for our route
fn chat_route( fn chat_route(
req: HttpRequest, req: HttpRequest,
stream: web::Payload, stream: web::Payload,
chat_server: web::Data<Addr<ChatServer>>, chat_server: web::Data<Addr<ChatServer>>,
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
ws::start( ws::start(
WSSession { WSSession {
cs_addr: chat_server.get_ref().to_owned(), cs_addr: chat_server.get_ref().to_owned(),
id: 0, id: 0,
hb: Instant::now(), hb: Instant::now(),
ip: req ip: req
.connection_info() .connection_info()
.remote() .remote()
.unwrap_or("127.0.0.1:12345") .unwrap_or("127.0.0.1:12345")
.split(":") .split(":")
.next() .next()
.unwrap_or("127.0.0.1") .unwrap_or("127.0.0.1")
.to_string(), .to_string(),
}, },
&req, &req,
stream, stream,
) )
} }
struct WSSession { struct WSSession {
cs_addr: Addr<ChatServer>, cs_addr: Addr<ChatServer>,
/// unique session id /// unique session id
id: usize, id: usize,
ip: String, ip: String,
/// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT), /// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT),
/// otherwise we drop connection. /// otherwise we drop connection.
hb: Instant, hb: Instant,
} }
impl Actor for WSSession { impl Actor for WSSession {
type Context = ws::WebsocketContext<Self>; type Context = ws::WebsocketContext<Self>;
/// Method is called on actor start. /// Method is called on actor start.
/// We register ws session with ChatServer /// We register ws session with ChatServer
fn started(&mut self, ctx: &mut Self::Context) { fn started(&mut self, ctx: &mut Self::Context) {
// we'll start heartbeat process on session start. // we'll start heartbeat process on session start.
self.hb(ctx); self.hb(ctx);
// register self in chat server. `AsyncContext::wait` register // register self in chat server. `AsyncContext::wait` register
// future within context, but context waits until this future resolves // future within context, but context waits until this future resolves
// before processing any other events. // before processing any other events.
// across all routes within application // across all routes within application
let addr = ctx.address(); let addr = ctx.address();
self.cs_addr self.cs_addr
.send(Connect { .send(Connect {
addr: addr.recipient(), addr: addr.recipient(),
ip: self.ip.to_owned(), ip: self.ip.to_owned(),
}) })
.into_actor(self) .into_actor(self)
.then(|res, act, ctx| { .then(|res, act, ctx| {
match res { match res {
Ok(res) => act.id = res, Ok(res) => act.id = res,
// something is wrong with chat server // something is wrong with chat server
_ => ctx.stop(), _ => ctx.stop(),
} }
fut::ok(()) fut::ok(())
}) })
.wait(ctx); .wait(ctx);
} }
fn stopping(&mut self, _ctx: &mut Self::Context) -> Running { fn stopping(&mut self, _ctx: &mut Self::Context) -> Running {
// notify chat server // notify chat server
self.cs_addr.do_send(Disconnect { self.cs_addr.do_send(Disconnect {
id: self.id, id: self.id,
ip: self.ip.to_owned(), ip: self.ip.to_owned(),
}); });
Running::Stop Running::Stop
} }
} }
/// Handle messages from chat server, we simply send it to peer websocket /// Handle messages from chat server, we simply send it to peer websocket
/// These are room messages, IE sent to others in the room /// These are room messages, IE sent to others in the room
impl Handler<WSMessage> for WSSession { impl Handler<WSMessage> for WSSession {
type Result = (); type Result = ();
fn handle(&mut self, msg: WSMessage, ctx: &mut Self::Context) { fn handle(&mut self, msg: WSMessage, ctx: &mut Self::Context) {
// println!("id: {} msg: {}", self.id, msg.0); // println!("id: {} msg: {}", self.id, msg.0);
ctx.text(msg.0); ctx.text(msg.0);
} }
} }
/// WebSocket message handler /// WebSocket message handler
impl StreamHandler<ws::Message, ws::ProtocolError> for WSSession { impl StreamHandler<ws::Message, ws::ProtocolError> for WSSession {
fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) { fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
// println!("WEBSOCKET MESSAGE: {:?} from id: {}", msg, self.id); // println!("WEBSOCKET MESSAGE: {:?} from id: {}", msg, self.id);
match msg { match msg {
ws::Message::Ping(msg) => { ws::Message::Ping(msg) => {
self.hb = Instant::now(); self.hb = Instant::now();
ctx.pong(&msg); ctx.pong(&msg);
} }
ws::Message::Pong(_) => { ws::Message::Pong(_) => {
self.hb = Instant::now(); self.hb = Instant::now();
} }
ws::Message::Text(text) => { ws::Message::Text(text) => {
let m = text.trim().to_owned(); let m = text.trim().to_owned();
println!("WEBSOCKET MESSAGE: {:?} from id: {}", &m, self.id); println!("WEBSOCKET MESSAGE: {:?} from id: {}", &m, self.id);
self.cs_addr self.cs_addr
.send(StandardMessage { .send(StandardMessage {
id: self.id, id: self.id,
msg: m, msg: m,
}) })
.into_actor(self) .into_actor(self)
.then(|res, _, ctx| { .then(|res, _, ctx| {
match res { match res {
Ok(res) => ctx.text(res), Ok(res) => ctx.text(res),
Err(e) => { Err(e) => {
eprintln!("{}", &e); eprintln!("{}", &e);
} }
}
fut::ok(())
})
.wait(ctx);
} }
ws::Message::Binary(_bin) => println!("Unexpected binary"), fut::ok(())
ws::Message::Close(_) => { })
ctx.stop(); .wait(ctx);
} }
_ => {} ws::Message::Binary(_bin) => println!("Unexpected binary"),
} ws::Message::Close(_) => {
ctx.stop();
}
_ => {}
} }
}
} }
impl WSSession { impl WSSession {
/// helper method that sends ping to client every second. /// helper method that sends ping to client every second.
/// ///
/// also this method checks heartbeats from client /// also this method checks heartbeats from client
fn hb(&self, ctx: &mut ws::WebsocketContext<Self>) { fn hb(&self, ctx: &mut ws::WebsocketContext<Self>) {
ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| { ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
// check client heartbeats // check client heartbeats
if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT { if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {
// heartbeat timed out // heartbeat timed out
println!("Websocket Client heartbeat failed, disconnecting!"); println!("Websocket Client heartbeat failed, disconnecting!");
// notify chat server // notify chat server
act.cs_addr.do_send(Disconnect { act.cs_addr.do_send(Disconnect {
id: act.id, id: act.id,
ip: act.ip.to_owned(), ip: act.ip.to_owned(),
});
// stop actor
ctx.stop();
// don't try to send a ping
return;
}
ctx.ping("");
}); });
}
// stop actor
ctx.stop();
// don't try to send a ping
return;
}
ctx.ping("");
});
}
} }
fn main() { fn main() {
let _ = env_logger::init(); let _ = env_logger::init();
let sys = actix::System::new("lemmy"); let sys = actix::System::new("lemmy");
// Run the migrations from code // Run the migrations from code
let conn = establish_connection(); let conn = establish_connection();
embedded_migrations::run(&conn).unwrap(); embedded_migrations::run(&conn).unwrap();
// Start chat server actor in separate thread // Start chat server actor in separate thread
let server = ChatServer::default().start(); let server = ChatServer::default().start();
// Create Http server with websocket support // Create Http server with websocket support
HttpServer::new(move || { HttpServer::new(move || {
App::new() App::new()
.data(server.clone()) .data(server.clone())
.service(web::resource("/api/v1/ws").to(chat_route)) .service(web::resource("/api/v1/ws").to(chat_route))
// .service(web::resource("/api/v1/rest").route(web::post().to(||{}))) // .service(web::resource("/api/v1/rest").route(web::post().to(||{})))
.service(web::resource("/").to(index)) .service(web::resource("/").to(index))
// static resources // static resources
.service(actix_files::Files::new("/static", front_end_dir())) .service(actix_files::Files::new("/static", front_end_dir()))
}) })
.bind("0.0.0.0:8536") .bind("0.0.0.0:8536")
.unwrap() .unwrap()
.start(); .start();
println!("Started http server: 0.0.0.0:8536"); println!("Started http server: 0.0.0.0:8536");
let _ = sys.run(); let _ = sys.run();
} }
fn index() -> Result<NamedFile, actix_web::error::Error> { fn index() -> Result<NamedFile, actix_web::error::Error> {
Ok(NamedFile::open(front_end_dir() + "/index.html")?) Ok(NamedFile::open(front_end_dir() + "/index.html")?)
} }
fn front_end_dir() -> String { fn front_end_dir() -> String {
env::var("LEMMY_FRONT_END_DIR").unwrap_or("../ui/dist".to_string()) env::var("LEMMY_FRONT_END_DIR").unwrap_or("../ui/dist".to_string())
} }