diff options
Diffstat (limited to 'game_server/src')
-rw-r--r-- | game_server/src/backend_connection.rs | 31 | ||||
-rw-r--r-- | game_server/src/gameserver.rs | 0 | ||||
-rw-r--r-- | game_server/src/group.rs | 22 | ||||
-rw-r--r-- | game_server/src/lobby.rs | 10 | ||||
-rw-r--r-- | game_server/src/main.rs | 13 | ||||
-rw-r--r-- | game_server/src/test_group.rs | 28 |
6 files changed, 77 insertions, 27 deletions
diff --git a/game_server/src/backend_connection.rs b/game_server/src/backend_connection.rs new file mode 100644 index 0000000..9307c4a --- /dev/null +++ b/game_server/src/backend_connection.rs @@ -0,0 +1,31 @@ +use reqwest::{Response, Client, Url, UrlError, Error as ReqError}; + +pub struct BackendConnection { + host: String, + client: Client, + last_response: Option<Result<Response, ReqError>> +} + +impl BackendConnection { + pub fn new(host: &str) -> Self { + BackendConnection { + host: host.to_string(), + client: Client::new(), + last_response: None + } + } + + pub fn request(&mut self, location: &str) -> Result<(), UrlError> { + Ok(self.last_response = + Some(self.client.get(Url::parse(&format!("{}{}", self.host, location))?) + .send())) + } + + pub fn get_response(&self) -> &Option<Result<Response, ReqError>> { + &self.last_response + } + + pub fn host_name<'a>(&'a self) -> &'a str { + &self.host + } +} diff --git a/game_server/src/gameserver.rs b/game_server/src/gameserver.rs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/game_server/src/gameserver.rs diff --git a/game_server/src/group.rs b/game_server/src/group.rs index 9774979..55e4fbf 100644 --- a/game_server/src/group.rs +++ b/game_server/src/group.rs @@ -1,22 +1,8 @@ pub type GroupId = u32; -pub struct Group { - id: GroupId, - name: String, -} - -impl Group { - pub(crate) fn new(id: GroupId, name: String) -> Group { - Group { id, name } - } - - pub(crate) fn get_id(&self) -> GroupId { - self.id - } +pub trait Group { + fn id(&self) -> GroupId; + fn name(&self) -> String; - pub fn run(&self) { - let id = self.id; - std::thread::spawn(move || - loop {println!("group id: {} meldet sich", id)}); - } + fn run(&self); } diff --git a/game_server/src/lobby.rs b/game_server/src/lobby.rs index 8808b7f..fe3bdee 100644 --- a/game_server/src/lobby.rs +++ b/game_server/src/lobby.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use super::group::{Group, GroupId}; pub struct Lobby { - groups: HashMap<GroupId, Group>, + groups: HashMap<GroupId, Box<Group>>, } impl Lobby { @@ -13,8 +13,8 @@ impl Lobby { } } - pub fn add_group(&mut self, group: Group) { - self.groups.insert(group.get_id(), group); + pub fn add_group(&mut self, group: Box<Group>) { + self.groups.insert(group.id(), group); } pub fn iter<'a>(&'a self) -> GroupIterator<'a> { @@ -23,11 +23,11 @@ impl Lobby { } pub struct GroupIterator<'a> { - groups: std::collections::hash_map::Values<'a, GroupId, Group> + groups: std::collections::hash_map::Values<'a, GroupId, Box<Group>> } impl<'a> Iterator for GroupIterator<'a> { - type Item = &'a Group; + type Item = &'a Box<Group>; fn next(&mut self) -> Option<Self::Item> { self.groups.next() diff --git a/game_server/src/main.rs b/game_server/src/main.rs index 7e08b46..f7a1085 100644 --- a/game_server/src/main.rs +++ b/game_server/src/main.rs @@ -1,22 +1,27 @@ mod group; +mod test_group; mod lobby; +mod backend_connection; #[macro_use] extern crate log; use pretty_env_logger; -use group::Group; +use test_group::TestGroup; use lobby::Lobby; +use backend_connection::BackendConnection; fn main() { pretty_env_logger::init(); let mut lobby = Lobby::new(); - lobby.add_group(Group::new(0, "Test".to_string())); - lobby.add_group(Group::new(1, "Very Serious".to_string())); for group in lobby.iter() { group.run() } - loop {} + let mut backend = BackendConnection::new("http://129.13.215.68:5000"); + loop { + backend.request("/scribble").unwrap(); + println!("{:?}", backend.get_response()); + } } diff --git a/game_server/src/test_group.rs b/game_server/src/test_group.rs new file mode 100644 index 0000000..bd570e3 --- /dev/null +++ b/game_server/src/test_group.rs @@ -0,0 +1,28 @@ +use super::group::{Group, GroupId}; + +pub struct TestGroup { + id: GroupId, + name: String, +} + +impl Group for TestGroup { + fn id(&self) -> GroupId { + self.id + } + + fn name(&self) -> String { + self.name.clone() + } + + fn run(&self) { + let id = self.id; + let name = self.name.to_owned(); + std::thread::spawn(move || /*loop { println!("> group nr.{} wishes you: '{}'", id, name) }*/()); + } +} + +impl TestGroup { + pub fn new(id: GroupId, name: String) -> Self { + TestGroup { id, name } + } +} |