Removing "name", Owner role, Promoting, Live events!
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
use std::env;
|
||||
use std::future::Future;
|
||||
use std::net::{IpAddr, Ipv6Addr, SocketAddr};
|
||||
use std::sync::{Arc};
|
||||
use dotenvy::dotenv;
|
||||
use durian::{PacketManager, ServerConfig};
|
||||
use futures::future::{self};
|
||||
@@ -13,9 +14,9 @@ use tarpc::{
|
||||
};
|
||||
use tarpc::server::incoming::Incoming;
|
||||
use tarpc::server::BaseChannel;
|
||||
use tokio::sync::Mutex;
|
||||
use tracing::{info, subscriber, warn};
|
||||
use realm_server::events;
|
||||
use realm_server::events::{GreetPacketBuilder};
|
||||
use realm_server::events::*;
|
||||
use realm_server::server::RealmChatServer;
|
||||
use realm_server::types::RealmChat;
|
||||
|
||||
@@ -35,7 +36,7 @@ async fn main() -> anyhow::Result<()> {
|
||||
.with_target(false)
|
||||
.finish();
|
||||
|
||||
subscriber::set_global_default(subscriber).unwrap();
|
||||
subscriber::set_global_default(subscriber)?;
|
||||
|
||||
let database_url: &str = &env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
||||
|
||||
@@ -49,28 +50,47 @@ async fn main() -> anyhow::Result<()> {
|
||||
warn!("Database already exists");
|
||||
} // TODO: Do in Docker with Sqlx-cli
|
||||
|
||||
let db_pool = SqlitePool::connect(database_url).await.unwrap();
|
||||
let db_pool = SqlitePool::connect(database_url).await?;
|
||||
|
||||
info!("Running migrations...");
|
||||
migrate!().run(&db_pool).await?; // TODO: Do in Docker with Sqlx-cli
|
||||
info!("Migrations complete!");
|
||||
|
||||
let port = env::var("PORT").expect("PORT must be set").parse::<u16>().unwrap();
|
||||
let port = env::var("PORT").expect("PORT must be set").parse::<u16>()?;
|
||||
let server_addr = (IpAddr::V6(Ipv6Addr::LOCALHOST), port);
|
||||
|
||||
let mut manager = PacketManager::new();
|
||||
manager.init_server(
|
||||
let mut inner_manager = PacketManager::new_for_async();
|
||||
|
||||
inner_manager.register_receive_packet::<Greet>(GreetPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<UserJoinedEvent>(UserJoinedEventPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<UserLeftEvent>(UserLeftEventPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<NewMessageEvent>(NewMessageEventPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<StartTypingEvent>(StartTypingEventPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<StopTypingEvent>(StopTypingEventPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<NewRoomEvent>(NewRoomEventPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<DeleteRoomEvent>(DeleteRoomEventPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<KickedUserEvent>(KickedUserEventPacketBuilder)?;
|
||||
inner_manager.register_receive_packet::<BannedUserEvent>(BannedUserEventPacketBuilder)?;
|
||||
|
||||
inner_manager.register_send_packet::<Greet>()?;
|
||||
inner_manager.register_send_packet::<UserJoinedEvent>()?;
|
||||
inner_manager.register_send_packet::<UserLeftEvent>()?;
|
||||
inner_manager.register_send_packet::<NewMessageEvent>()?;
|
||||
inner_manager.register_send_packet::<StartTypingEvent>()?;
|
||||
inner_manager.register_send_packet::<StopTypingEvent>()?;
|
||||
inner_manager.register_send_packet::<NewRoomEvent>()?;
|
||||
inner_manager.register_send_packet::<DeleteRoomEvent>()?;
|
||||
inner_manager.register_send_packet::<KickedUserEvent>()?;
|
||||
inner_manager.register_send_packet::<BannedUserEvent>()?;
|
||||
|
||||
inner_manager.async_init_server(
|
||||
ServerConfig::new(
|
||||
SocketAddr::from((IpAddr::V6(Ipv6Addr::LOCALHOST), port-1)).to_string(),
|
||||
0, None, 2, 256))?;
|
||||
0, None, 10, 10)).await?;
|
||||
|
||||
let manager = Arc::new(Mutex::new(inner_manager));
|
||||
info!("Listening on port {}", port-1);
|
||||
|
||||
let callback = |_| {
|
||||
|
||||
};
|
||||
|
||||
manager.register_receive_packet::<events::Greet>(GreetPacketBuilder).unwrap();
|
||||
|
||||
|
||||
// JSON transport is provided by the json_transport tarpc module. It makes it easy
|
||||
// to start up a serde-powered json serialization strategy over TCP.
|
||||
let mut listener = tarpc::serde_transport::tcp::listen(&server_addr, Json::default).await?;
|
||||
@@ -85,7 +105,7 @@ async fn main() -> anyhow::Result<()> {
|
||||
// serve is generated by the service attribute. It takes as input any type implementing
|
||||
// the generated World trait.
|
||||
.map(|channel| {
|
||||
let server = RealmChatServer::new(env::var("SERVER_ID").expect("SERVER_ID must be set"), channel.transport().peer_addr().unwrap(), db_pool.clone());
|
||||
let server = RealmChatServer::new(env::var("SERVER_ID").expect("SERVER_ID must be set"), channel.transport().peer_addr().unwrap(), db_pool.clone(), manager.clone());
|
||||
channel.execute(server.serve()).for_each(spawn)
|
||||
})
|
||||
// Max 10 channels.
|
||||
|
||||
Reference in New Issue
Block a user