joshuafhiggins/realm-chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Selecting/Creating/Joining Rooms & Severs!

Browse Source
This commit is contained in:
Joshua Higgins
2024-10-13 16:46:28 -04:00
Unverified
parent 3d2445c94c
commit 8168f19b5f
9 changed files with 473 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
server/src/main.rs
View File

@@ -3,7 +3,6 @@ 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};
use futures::StreamExt;
use sqlx::migrate::MigrateDatabase;
@@ -18,7 +17,7 @@ use tokio::sync::Mutex;
use tracing::{info, subscriber, warn};
use realm_server::events::*;
use realm_server::server::RealmChatServer;
use realm_server::types::RealmChat;
use realm_server::types::{RealmChat};
async fn spawn(fut: impl Future<Output = ()> + Send + 'static) {
tokio::spawn(fut);
@@ -57,39 +56,32 @@ async fn main() -> anyhow::Result<()> {
info!("Migrations complete!");
let port = env::var("PORT").expect("PORT must be set").parse::<u16>()?;
let server_addr = (IpAddr::V6(Ipv6Addr::LOCALHOST), port);
let server_addr = (IpAddr::V4("0.0.0.0".parse()?), port);
let mut inner_manager = PacketManager::new();
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.init_server(
ServerConfig::new(
SocketAddr::from((IpAddr::V6(Ipv6Addr::LOCALHOST), port-1)).to_string(),
0, None, 8, 8))?;
let manager = Arc::new(Mutex::new(inner_manager));
info!("Listening on port {}", port-1);
// let (handler, listener) = node::split::<()>();
// handler.network().listen(Transport::FramedTcp, "0.0.0.0:"+(port-1))?;
// info!("Listening on port {}", port-1);
//
// // Read incoming network events.
// listener.for_each(|event| match event.network() {
// NetEvent::Connected(_, _) => unreachable!(), // Used for explicit connections.
// NetEvent::Accepted(_endpoint, _listener) => println!("Client connected"), // Tcp or Ws
// NetEvent::Message(endpoint, data) => {
// println!("Received: {}", String::from_utf8_lossy(data));
// handler.network().send(endpoint, data);
// },
// NetEvent::Disconnected(_endpoint) => println!("Client disconnected"), //Tcp or Ws
// });
//
// inner_manager.init_server(
// ServerConfig::new(
// SocketAddr::from((IpAddr::V4("0.0.0.0".parse()?), port-1)).to_string(),
// 0, None, 8, 8))?;
//
// let manager = Arc::new(Mutex::new(NetIO {
// handler,
// listener,
// }));
// 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.
@@ -105,7 +97,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(), manager.clone());
let server = RealmChatServer::new(env::var("SERVER_ID").expect("SERVER_ID must be set"), channel.transport().peer_addr().unwrap(), db_pool.clone());
channel.execute(server.serve()).for_each(spawn)
})
// Max 10 channels.