Development into Master #10
|
|
@ -1,18 +0,0 @@
|
|||
use std::sync::{Weak,Arc};
|
||||
|
||||
pub trait IOwned<T> {
|
||||
fn set_owner(&self, owner: Weak<T>);
|
||||
}
|
||||
|
||||
pub trait IOwner<T> {
|
||||
fn add_child(&self, child: Arc<T>);
|
||||
fn get_ref(&self) -> Weak<Self>;
|
||||
}
|
||||
|
||||
pub trait IMessagable<M> {
|
||||
fn send_message(&self, msg: M);
|
||||
}
|
||||
|
||||
pub trait ICooperative {
|
||||
fn tick(&self);
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
pub trait IMessagable<M> {
|
||||
fn send_message(&self, msg: M);
|
||||
}
|
||||
|
||||
pub trait ICooperative {
|
||||
fn tick(&self);
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
// pub mod commands;
|
||||
pub mod prelude;
|
||||
pub mod server;
|
||||
pub mod Foundation;
|
||||
pub mod foundation;
|
||||
pub mod commands;
|
||||
|
||||
use std::sync::Arc;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ use serde::{Serialize, Deserialize};
|
|||
use crossbeam_channel::{Sender, Receiver, unbounded};
|
||||
|
||||
use traits::IClient;
|
||||
use crate::lib::Foundation::{ICooperative, IMessagable};
|
||||
use crate::lib::foundation::{ICooperative, IMessagable};
|
||||
use crate::lib::server::ServerMessages;
|
||||
|
||||
/// # ClientMessage
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
use std::sync::Arc;
|
||||
use std::net::TcpStream;
|
||||
use std::collections::HashMap;
|
||||
|
||||
use crossbeam_channel::Sender;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,13 @@ use self::client::Client;
|
|||
use self::client::ClientMessage;
|
||||
use self::traits::TClientManager;
|
||||
use crate::lib::server::ServerMessages;
|
||||
use crate::lib::Foundation::IMessagable;
|
||||
use crate::lib::Foundation::ICooperative;
|
||||
use crate::lib::foundation::IMessagable;
|
||||
use crate::lib::foundation::ICooperative;
|
||||
|
||||
enum ClientManagerMessages {
|
||||
#[allow(dead_code)]
|
||||
DropAll,
|
||||
#[allow(dead_code)]
|
||||
MessageClient,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,31 @@
|
|||
pub mod client_management;
|
||||
pub mod network_manager;
|
||||
|
||||
use crate::lib::server::network_manager::NetworkManager;
|
||||
use std::collections::HashMap;
|
||||
use std::net::TcpListener;
|
||||
use std::sync::Arc;
|
||||
use std::io::Write;
|
||||
use std::io::Read;
|
||||
|
||||
|
||||
use uuid::Uuid;
|
||||
use crossbeam_channel::{Sender, Receiver, unbounded};
|
||||
use crate::lib::server::network_manager::NetworkManager;
|
||||
use std::sync::Arc;
|
||||
|
||||
use crossbeam_channel::{Receiver, unbounded};
|
||||
|
||||
use crate::lib::server::client_management::ClientManager;
|
||||
use crate::lib::server::client_management::traits::TClientManager;
|
||||
use crate::lib::Foundation::{ICooperative};
|
||||
use crate::lib::foundation::{ICooperative};
|
||||
use client_management::client::Client;
|
||||
use crate::lib::commands::Commands;
|
||||
|
||||
/// # ServerMessages
|
||||
/// This is used internally
|
||||
#[derive(Debug)]
|
||||
pub enum ServerMessages {
|
||||
ClientConnected(Arc<Client>),
|
||||
ClientDisconnected(Uuid)
|
||||
|
||||
#[allow(dead_code)]
|
||||
ClientDisconnected(Uuid),
|
||||
}
|
||||
|
||||
pub struct Server {
|
||||
client_manager: Arc<ClientManager>,
|
||||
network_manager: Arc<NetworkManager>,
|
||||
|
||||
sender: Sender<ServerMessages>,
|
||||
receiver: Receiver<ServerMessages>,
|
||||
}
|
||||
|
||||
|
|
@ -42,8 +37,6 @@ impl Server {
|
|||
client_manager: ClientManager::new(sender.clone()),
|
||||
|
||||
network_manager: NetworkManager::new("5600".to_string(), sender.clone()),
|
||||
|
||||
sender,
|
||||
receiver,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
|
|||
use crossbeam_channel::Sender;
|
||||
|
||||
use crate::lib::server::ServerMessages;
|
||||
use crate::lib::Foundation::ICooperative;
|
||||
use crate::lib::foundation::ICooperative;
|
||||
use crate::lib::server::client_management::client::traits::IClient;
|
||||
|
||||
|
||||
|
|
@ -31,9 +31,9 @@ enum NetworkSockOut<'a> {
|
|||
}
|
||||
|
||||
// these are control signals from the server.
|
||||
pub enum NetworkMessages {
|
||||
// pub enum NetworkMessages {
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
pub struct NetworkManager {
|
||||
listener: TcpListener,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ mod lib;
|
|||
use clap::{App, Arg};
|
||||
|
||||
use crate::lib::server::Server;
|
||||
use crate::lib::Foundation::ICooperative;
|
||||
use crate::lib::foundation::ICooperative;
|
||||
|
||||
fn main() {
|
||||
let _args = App::new("--rust chat server--")
|
||||
|
|
|
|||
Loading…
Reference in New Issue