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

upgrade

Browse source
This commit is contained in:
jonnnh 2019-07-17 19:11:01 +08:00
parent c6dacb485c
commit 28b69fb1fc
3 changed files with 1001 additions and 1261 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1916
server/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

37
server/Cargo.toml
View file

@ -6,22 +6,23 @@ edition = "2018"
[dependencies] [dependencies]
diesel = { version = "1.4.2", features = ["postgres","chrono"] } diesel = { version = "1.4.2", features = ["postgres","chrono"] }
diesel_migrations = "*" diesel_migrations = "1.4.0"
dotenv = "0.9.0" dotenv = "0.14.1"
bcrypt = "0.3" bcrypt = "0.5.0"
activitypub = "0.1.4" activitypub = "0.1.5"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4.7", features = ["serde"] }
failure = "0.1.5" failure = "0.1.5"
serde_json = "*" serde_json = "1.0.40"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0.94", features = ["derive"] }
actix = "*" actix = "0.8.3"
actix-web = "*" actix-web = "1.0"
env_logger = "*" actix-files = "0.1.3"
rand = "0.6.5" actix-web-actors = "1.0"
strum = "0.14.0" env_logger = "0.6.2"
strum_macros = "0.14.0" rand = "0.7.0"
jsonwebtoken = "*" strum = "0.15.0"
regex = "*" strum_macros = "0.15.0"
lazy_static = "*" jsonwebtoken = "6.0.1"
reqwest = "*" regex = "1.1.9"
openssl = { version = "0.10", features = ["vendored"] } lazy_static = "1.3.0"

309
server/src/main.rs
View file

@ -1,11 +1,13 @@
extern crate lemmy_server; extern crate lemmy_server;
#[macro_use] extern crate diesel_migrations; #[macro_use]
extern crate diesel_migrations;
use std::time::{Instant, Duration}; use std::time::{Instant, Duration};
use std::env; use std::env;
use lemmy_server::actix::*; use actix_web::*;
use lemmy_server::actix_web::server::HttpServer; use actix::prelude::*;
use lemmy_server::actix_web::{ws, App, Error, HttpRequest, HttpResponse, fs::NamedFile, fs}; use actix_files::NamedFile;
use actix_web_actors::ws;
use lemmy_server::websocket::server::*; use lemmy_server::websocket::server::*;
use lemmy_server::db::establish_connection; use lemmy_server::db::establish_connection;
@ -16,203 +18,190 @@ const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
/// How long before lack of client response causes a timeout /// How long before lack of client response causes a timeout
const CLIENT_TIMEOUT: Duration = Duration::from_secs(10); const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
/// This is our websocket route state, this state is shared with all route
/// instances via `HttpContext::state()`
struct WsChatSessionState {
addr: Addr<ChatServer>,
}
/// Entry point for our route /// Entry point for our route
fn chat_route(req: &HttpRequest<WsChatSessionState>) -> Result<HttpResponse, Error> { fn chat_route(req: HttpRequest, stream: web::Payload, chat_server: web::Data<Addr<ChatServer>>) -> Result<HttpResponse, Error> {
ws::start( ws::start(
req, WSSession {
WSSession { cs_addr: chat_server.get_ref().to_owned(),
id: 0, id: 0,
hb: Instant::now(), hb: Instant::now(),
ip: req.connection_info() ip: req.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,
stream,
) )
} }
struct WSSession { struct WSSession {
/// unique session id cs_addr: Addr<ChatServer>,
id: usize, /// unique session id
ip: String, id: usize,
/// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT), ip: String,
/// otherwise we drop connection. /// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT),
hb: Instant /// otherwise we drop connection.
hb: Instant,
} }
impl Actor for WSSession { impl Actor for WSSession {
type Context = ws::WebsocketContext<Self, WsChatSessionState>; 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.
// HttpContext::state() is instance of WsChatSessionState, state is shared // across all routes within application
// across all routes within application let addr = ctx.address();
let addr = ctx.address(); self.cs_addr
ctx.state() .send(Connect {
.addr addr: addr.recipient(),
.send(Connect { ip: self.ip.to_owned(),
addr: addr.recipient(), })
ip: self.ip.to_owned(), .into_actor(self)
}) .then(|res, act, ctx| {
.into_actor(self) match res {
.then(|res, act, ctx| { Ok(res) => act.id = res,
match res { // something is wrong with chat server
Ok(res) => act.id = res, _ => ctx.stop(),
// something is wrong with chat server }
_ => 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
ctx.state().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(_) => {
self.hb = Instant::now();
}
ws::Message::Text(text) => {
let m = text.trim().to_owned();
println!("WEBSOCKET MESSAGE: {:?} from id: {}", &m, self.id);
ctx.state()
.addr
.send(StandardMessage {
id: self.id,
msg: m,
})
.into_actor(self)
.then(|res, _, ctx| {
match res {
Ok(res) => ctx.text(res),
Err(e) => {
eprintln!("{}", &e);
}
} }
fut::ok(()) ws::Message::Pong(_) => {
}) self.hb = Instant::now();
.wait(ctx); }
} ws::Message::Text(text) => {
ws::Message::Binary(_bin) => println!("Unexpected binary"), let m = text.trim().to_owned();
ws::Message::Close(_) => { println!("WEBSOCKET MESSAGE: {:?} from id: {}", &m, self.id);
ctx.stop();
}, self.cs_addr
.send(StandardMessage {
id: self.id,
msg: m,
})
.into_actor(self)
.then(|res, _, ctx| {
match res {
Ok(res) => ctx.text(res),
Err(e) => {
eprintln!("{}", &e);
}
}
fut::ok(())
})
.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, WsChatSessionState>) { 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
ctx.state() act.cs_addr
.addr .do_send(Disconnect { id: act.id, ip: act.ip.to_owned() });
.do_send(Disconnect { id: act.id, ip: act.ip.to_owned() });
// stop actor // stop actor
ctx.stop(); ctx.stop();
// don't try to send a ping // don't try to send a ping
return; return;
} }
ctx.ping(""); 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 = Arbiter::start(|_| ChatServer::default()); let server = ChatServer::default().start();
// Create Http server with websocket support
HttpServer::new(move || {
// Create Http server with websocket support App::new()
HttpServer::new(move || { .data(server.clone())
// Websocket sessions state .service(web::resource("/api/v1/ws").to(chat_route))
let state = WsChatSessionState { // .service(web::resource("/api/v1/rest").route(web::post().to(||{})))
addr: server.clone(), .service(web::resource("/").to(index))
}; // static resources
.service(actix_files::Files::new("/static", front_end_dir()))
}).bind("0.0.0.0:8536")
.unwrap()
.start();
App::with_state(state) println!("Started http server: 0.0.0.0:8536");
// .resource("/api/v1/rest", |r| r.method(http::Method::POST).f(|_| {}) let _ = sys.run();
.resource("/api/v1/ws", |r| r.route().f(chat_route))
// static resources
.resource("/", |r| r.route().f(index))
.handler(
"/static",
fs::StaticFiles::new(front_end_dir()).unwrap()
)
.finish()
}).bind("0.0.0.0:8536")
.unwrap()
.start();
println!("Started http server: 0.0.0.0:8536");
let _ = sys.run();
} }
fn index(_req: &HttpRequest<WsChatSessionState>) -> 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())
} }