fix: Actually remove legacy server module

7 files changed, 0 insertions, 1045 deletions

diff --git a/src/server_dev/room/__server.rs b/src/server_dev/room/__server.rs
deleted file mode 100644
index 0923e1b..0000000
--- a/src/server_dev/room/__server.rs
+++ /dev/null
@@ -1,382 +0,0 @@
-use std::error::Error;
-use crate::server::auto::cmd::property::{
-	create_property_update_command,
-	create_property_request_command
-};
-use crate::server::cmd::text::{create_text_command_with_action, create_text_command};
-use std::str::from_utf8;
-use crate::server::cmd::buddy_list::create_buddy_list_notify_command;
-use crate::server::auto::cmd::room::create_room_id_redirect_command;
-use crate::server::room::cmd::session::parse_session_initialization_command;
-use crate::server::parser::get_commands_from_buffer;
-use crate::server::cmd::property::parse_property_set_command;
-use crate::config::get_config;
-use mio::{Poll, Events, Token, Interest, Registry};
-use mio::net::{TcpListener, TcpStream};
-use std::collections::{HashMap, HashSet};
-use mio::event::Event;
-use std::io::{Read, ErrorKind, Write};
-use bytes::BytesMut;
-
-pub struct RoomServer {
-	pub clients: HashMap<Token, String>,
-	pub connections: HashMap<Token, TcpStream>,
-	pub room_ids: Vec<String>,
-}
-impl RoomServer {
-	pub fn listen(&mut self, addr: &str) -> Result<(), Box<dyn Error>> {
-		let mut listener = TcpListener::bind(addr.parse().unwrap())?;
-		let mut poll = Poll::new()?;
-		let mut events = Events::with_capacity(1024);
-		let mut counter: usize = 0;
-		// let mut sockets = HashMap::new();
-		let mut requests = HashMap::new();
-		let mut buffer = [0 as u8; 1024];
-		// let mut room_ids = vec![];
-
-		poll.registry().register(
-			&mut listener,
-			Token(0),
-			Interest::READABLE,
-		)?;
-
-		debug!("RoomServer now listening on {}", listener.local_addr().unwrap());
-
-		loop {
-			poll.poll(&mut events, None)?;
-
-			for event in &events {
-				match event.token() {
-					Token(0) => loop {
-						match listener.accept() {
-							Ok((mut stream, address)) => {
-								counter += 1;
-								let token = Token(counter);
-
-								poll.registry().register(
-									&mut stream,
-									token,
-									Interest::READABLE,
-								)?;
-
-								debug!("registered peer with address '{}' as '{}'", address, token.0);
-
-								// sockets.insert(token, stream);
-								self.connections.insert(token, stream);
-								requests.insert(token, Vec::with_capacity(192));
-							}
-							Err(ref err) if err.kind() == ErrorKind::WouldBlock => break,
-							Err(err) => {
-								error!("unexpected error: {}", err);
-								poll.registry().deregister(
-									self.connections.get_mut(&Token(counter)).unwrap(),
-								)?;
-								break;
-							}
-						}
-					},
-					token if event.is_readable() => {
-						loop {
-							let read = self.connections.get_mut(&token).unwrap()
-								.read(&mut buffer);
-							match read {
-								Ok(0) => { self.connections.remove(&token); break; }
-								Ok(n) => {
-									let req = requests.get_mut(&token).unwrap();
-									for b in &buffer[0..n] { req.push(*b); }
-
-									for cmd in get_commands_from_buffer(BytesMut::from(&buffer[..n])) {
-										match cmd.get(2).unwrap() {
-											10 => { // PROPREQ
-												debug!("received property request command from client 'null'");
-												self.connections.get_mut(&token).unwrap()
-													.write_all(&create_property_update_command()).unwrap();
-												debug!("sent property update command to client 'null'");
-											}
-											6 => { // SESSINIT
-												let local_username =
-													parse_session_initialization_command(cmd).username;
-												self.clients.insert(token, local_username.clone());
-												debug!(
-													"received session initialization command from client '{}'",
-													local_username,
-												);
-												self.connections.get_mut(&token).unwrap()
-													.write_all(&create_property_request_command()).unwrap();
-												debug!("sent session initialization command to client '{}'", local_username);
-											}
-											15 => { // PROPSET
-												let avatar = parse_property_set_command(cmd);
-												debug!(
-													"received property set command from client '{}': {}",
-													self.clients.get(&token).unwrap(),
-													avatar,
-												);
-												self.connections.get_mut(&token).unwrap()
-													.write_all(&create_text_command_with_action(
-														"WORLDSMASTER", &get_config().unwrap().worldsmaster_greeting,
-													)).unwrap();
-												debug!(
-													"sent session initialization command to client '{}'",
-													self.clients.get(&token).unwrap(),
-												);
-											}
-											29 =>  { // BUDDYLISTUPDATE
-												let received_buddy = from_utf8(
-													cmd.get(4..cmd.get(0).unwrap().to_owned() as usize - 1).unwrap()
-												).unwrap();
-												debug!(
-													"received buddy list update command from client '{}': {}",
-													self.clients.get(&token).unwrap(),
-													received_buddy,
-												);
-												self.connections.get_mut(&token).unwrap()
-													.write_all(&create_buddy_list_notify_command(received_buddy)).unwrap();
-												debug!(
-													"sent buddy list notify command to client '{}'",
-													self.clients.get(&token).unwrap(),
-												);
-											}
-											// 20 => { // ROOMIDRQ
-											// 	let room_name = from_utf8(
-											// 		cmd.get(4..cmd.get(0).unwrap().to_owned() as usize).unwrap()
-											// 	).unwrap();
-											// 	debug!(
-											// 		"received room id request command from client '{}': {}",
-											// 		self.clients.get(&token).unwrap(),
-											// 		room_name,
-											// 	);
-											// 	let room_id;
-											// 	if !self.room_ids.contains(&room_name.to_string()) {
-											// 		self.room_ids.push(room_name.to_string());
-											// 		room_id = self.room_ids.iter()
-											// 			.position(|i| i == &room_name.to_string())
-											// 			.unwrap();
-											// 		trace!("inserted room '{}' as '{}'", room_name, room_id);
-											// 	} else {
-											// 		let position = self.room_ids.iter()
-											// 			.position(|i| i == &room_name.to_string())
-											// 			.unwrap();
-											// 		trace!("found room '{}' as '{}'", room_name, position);
-											// 		room_id = position;
-											// 	}
-											// 	trace!("room name: {}, room id: {}", room_name, room_id);
-											// 	trace!("{:?}", self.room_ids);
-											// 	self.connections.get_mut(&token).unwrap()
-											// 		.write_all(&create_room_id_redirect_command(
-											// 			room_name, room_id,
-											// 		)).unwrap();
-											// }
-											14 => { // TEXT
-												let text = from_utf8(
-													cmd.get(6..cmd.get(0).unwrap().to_owned() as usize).unwrap()
-												).unwrap();
-												let username = self.clients.get(&token).unwrap().clone();
-												debug!(
-													"received text command from client '{}': {}",
-													username, format!("room: {}", text),
-												);
-												self.connections.iter_mut().for_each(|t|
-													t.1.write_all(&create_text_command(
-														&username,
-														text,
-													)).unwrap()
-												);
-												debug!("broadcasted text command to clients");
-											}
-											7 => { // SESSEXIT
-												debug!(
-													"received session exit command from client '{}'",
-													self.clients.get(&token).unwrap(),
-												);
-											}
-											_ => (),
-										}
-									}
-								}
-								Err(ref err) if err.kind() == ErrorKind::WouldBlock =>
-									break,
-								Err(err) => { error!("unexpected error: {}", err); break; }
-							}
-						}
-					}
-					_ => (),
-				}
-			}
-		}
-	}
-
-	fn broadcast(
-		sockets: &HashMap<Token, TcpStream>,
-		cmd: &[u8],
-	) -> () {
-		for mut socket in sockets {
-			socket.1.write_all(cmd).unwrap();
-		}
-	}
-
-	// fn process(
-	// 	&mut self,
-	// 	_registry: &Registry,
-	// 	event: &Event,
-	// 	token: Token,
-	// ) -> Result<bool, Box<dyn Error>> {
-	// 	if event.is_readable() {
-	// 		let mut connection_closed = false;
-	// 		let mut received_data = vec![0; 4096];
-	// 		let mut bytes_read = 0;
-	//
-	// 		let stream = self.connections.get_mut(&token).unwrap();
-	//
-	// 		loop {
-	// 			match stream.read(&mut received_data[bytes_read..]) {
-	// 				Ok(0) => {
-	// 					connection_closed = true;
-	// 					break;
-	// 				}
-	// 				Ok(n) => {
-	// 					bytes_read += n;
-	// 					if bytes_read ==  received_data.len() {
-	// 						received_data.resize(received_data.len() + 1024, 0);
-	// 					}
-	// 				}
-	// 				Err(ref err) if err.kind() == ErrorKind::WouldBlock => break,
-	// 				Err(ref err) if err.kind() == ErrorKind::Interrupted => continue,
-	// 				Err(err) => return Err(Box::new(err)),
-	// 			}
-	// 		}
-	//
-	// 		if bytes_read != 0 {
-	// 			self.handle(
-	// 				&mut received_data[..bytes_read],
-	// 				token,
-	// 			);
-	// 		}
-	// 		if connection_closed {
-	// 			println!("de-registered peer with token '{}'", token.0);
-	// 			return Ok(true);
-	// 		}
-	// 	}
-	//
-	// 	Ok(false)
-	// }
-
-	// fn handle(
-	// 	&mut self,
-	// 	data: &[u8],
-	// 	// stream: &mut TcpStream,
-	// 	token: Token,
-	// ) -> () {
-	// 	// trace!("i am client: {:?}", self.clients.get(&token));
-	// 	// debug!("{:?}", self.connections);
-	// 	for cmd in get_commands_from_buffer(BytesMut::from(data)) {
-	// 		debug!("received: {:?}", cmd);
-	// 		match cmd.get(2).unwrap() {
-	// 			10 => { // PROPREQ
-	// 				debug!("received property request command from client 'null'");
-	// 				self.connections.get_mut(&token).unwrap()
-	// 					.write_all(&create_property_update_command()).unwrap();
-	// 				debug!("sent property update command to client 'null'");
-	// 			}
-	// 			6 => { // SESSINIT
-	// 				let local_username =
-	// 					parse_session_initialization_command(cmd).username;
-	// 				self.clients.insert(token, local_username.clone());
-	// 				debug!(
-	// 					"received session initialization command from client '{}'",
-	// 					local_username,
-	// 				);
-	// 				self.connections.get_mut(&token).unwrap()
-	// 					.write_all(&create_property_request_command()).unwrap();
-	// 				debug!("sent session initialization command to client '{}'", local_username);
-	// 			}
-	// 			15 => { // PROPSET
-	// 				let avatar = parse_property_set_command(cmd);
-	// 				debug!(
-	// 					"received property set command from client '{}': {}",
-	// 					self.clients.get(&token).unwrap(),
-	// 					avatar,
-	// 				);
-	// 				self.connections.get_mut(&token).unwrap()
-	// 					.write_all(&create_text_command_with_action(
-	// 						"WORLDSMASTER", &get_config().unwrap().worldsmaster_greeting,
-	// 					)).unwrap();
-	// 				debug!(
-	// 					"sent session initialization command to client '{}'",
-	// 					self.clients.get(&token).unwrap(),
-	// 				);
-	// 			}
-	// 			29 =>  { // BUDDYLISTUPDATE
-	// 				let received_buddy = from_utf8(
-	// 					cmd.get(4..cmd.get(0).unwrap().to_owned() as usize - 1).unwrap()
-	// 				).unwrap();
-	// 				debug!(
-	// 					"received buddy list update command from client '{}': {}",
-	// 					self.clients.get(&token).unwrap(),
-	// 					received_buddy,
-	// 				);
-	// 				self.connections.get_mut(&token).unwrap()
-	// 					.write_all(&create_buddy_list_notify_command(received_buddy)).unwrap();
-	// 				debug!(
-	// 					"sent buddy list notify command to client '{}'",
-	// 					self.clients.get(&token).unwrap(),
-	// 				);
-	// 			}
-	// 			20 => { // ROOMIDRQ
-	// 				let room_name = from_utf8(
-	// 					cmd.get(4..cmd.get(0).unwrap().to_owned() as usize).unwrap()
-	// 				).unwrap();
-	// 				debug!(
-	// 					"received room id request command from client '{}': {}",
-	// 					self.clients.get(&token).unwrap(),
-	// 					room_name,
-	// 				);
-	// 				let room_id;
-	// 				if !self.room_ids.contains(&room_name.to_string()) {
-	// 					self.room_ids.push(room_name.to_string());
-	// 					room_id = self.room_ids.iter()
-	// 						.position(|i| i == &room_name.to_string())
-	// 						.unwrap();
-	// 					trace!("inserted room '{}' as '{}'", room_name, room_id);
-	// 				} else {
-	// 					let position = self.room_ids.iter()
-	// 						.position(|i| i == &room_name.to_string())
-	// 						.unwrap();
-	// 					trace!("found room '{}' as '{}'", room_name, position);
-	// 					room_id = position;
-	// 				}
-	// 				trace!("room name: {}, room id: {}", room_name, room_id);
-	// 				trace!("{:?}", self.room_ids);
-	// 				self.connections.get_mut(&token).unwrap()
-	// 					.write_all(&create_room_id_redirect_command(
-	// 						room_name, room_id,
-	// 					)).unwrap();
-	// 			}
-	// 			14 => { // TEXT
-	// 				let text = from_utf8(
-	// 					cmd.get(6..cmd.get(0).unwrap().to_owned() as usize).unwrap()
-	// 				).unwrap();
-	// 				let username = self.clients.get(&token).unwrap().clone();
-	// 				debug!(
-	// 					"received text command from client '{}': {}",
-	// 					username, text,
-	// 				);
-	// 				self.connections.iter_mut().for_each(|t|
-	// 					t.1.write_all(&create_text_command(
-	// 						&username,
-	// 						text,
-	// 					)).unwrap()
-	// 				);
-	// 				debug!("broadcasted text command to clients");
-	// 			}
-	// 			7 => { // SESSEXIT
-	// 				debug!(
-	// 					"received session exit command from client '{}'",
-	// 					self.clients.get(&token).unwrap(),
-	// 				);
-	// 			}
-	// 			_ => (),
-	// 		}
-	// 	}
-	// }
-}
diff --git a/src/server_dev/room/_server.rs b/src/server_dev/room/_server.rs
deleted file mode 100644
index e08c3d7..0000000
--- a/src/server_dev/room/_server.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use std::error::Error;
-use tokio::net::{TcpListener, TcpStream};
-use tokio::io::AsyncWriteExt;
-use crate::server::room::cmd::property::{
-	create_property_update_command,
-	create_property_request_command
-};
-use tokio_util::codec::{BytesCodec, Decoder};
-use tokio_stream::StreamExt;
-use crate::server::cmd::text::{create_text_command_with_action, create_text_command};
-use std::str::from_utf8;
-use crate::server::cmd::buddy_list::create_buddy_list_notify_command;
-use crate::server::auto::cmd::room::create_room_id_redirect_command;
-use std::sync::Arc;
-use tokio::sync::Mutex;
-use crate::server::shared::Shared;
-use crate::server::peer::Peer;
-use std::net::SocketAddr;
-use crate::server::room::cmd::session::parse_session_initialization_command;
-use crate::server::parser::get_commands_from_buffer;
-use crate::server::cmd::property::parse_property_set_command;
-
-
-pub struct RoomServer;
-impl RoomServer {
-	pub async fn listen(addr: &str) -> Result<(), Box<dyn Error>> {
-		let listener = TcpListener::bind(addr).await?;
-		debug!("RoomServer now listening on {}", listener.local_addr().unwrap());
-		let state = Arc::new(Mutex::new(Shared::new()));
-		let mut counter = 0;
-
-		loop {
-			let (stream, address) = listener.accept().await?;
-			counter += 1;
-			let state = Arc::clone(&state);
-
-			tokio::spawn(async move {
-				if let Err(e) = RoomServer::handle(
-					state,
-					stream,
-					address,
-					counter
-				).await {
-					error!("an error occurred: {}", e);
-				}
-			});
-		}
-	}
-
-	pub async fn handle(
-		state: Arc<Mutex<Shared>>,
-		stream: TcpStream,
-		address: SocketAddr,
-		count: usize,
-	) -> Result<(), Box<dyn Error>> {
-		let bytes = BytesCodec::new().framed(stream);
-		let mut peer = Peer::new(state.clone(), bytes, count.to_string()).await?;
-		debug!("registered peer with address '{}' as '{}'", address, count);
-		let mut room_ids: Vec<String> = Vec::new();
-		let mut username: String = String::new();
-
-		loop {
-			tokio::select! {
-				Some(msg) = peer.rx.recv() => {
-					// debug!("received bytes from peer: {:?}", &msg);
-					peer.bytes.get_mut().write_all(&msg).await?;
-				}
-				result = peer.bytes.next() => match result {
-					Some(Ok(msg)) => {
-						// let msg: BytesMut = msg;
-						for msg in get_commands_from_buffer(msg) {
-							match msg.get(2).unwrap() {
-								10 => { // PROPREQ
-									debug!("received property request command from client");
-									peer.bytes.get_mut()
-										.write_all(&create_property_update_command()).await?;
-									debug!("sent property update command to client");
-								}
-								6 => { // SESSINIT
-									username = parse_session_initialization_command(msg.clone()).username;
-									debug!(
-										"received session initialization command from client: {}",
-										username
-									);
-									peer.bytes.get_mut()
-										.write_all(&create_property_request_command()).await?;
-									debug!("sent session initialization command to client");
-								}
-								15 => { // PROPSET
-									let avatar = parse_property_set_command(msg.clone());
-									debug!("received property set command from client: {}", avatar);
-									peer.bytes.get_mut()
-										.write_all(&create_text_command_with_action(
-											"WORLDSMASTER", &std::env::var("WORLDSMASTER_GREETING")?
-										)).await?;
-									debug!("sent worldsmaster greeting to client");
-								}
-								29 => { // BUDDYLISTUPDATE
-									let received_buddy = from_utf8(
-										msg.get(4..msg.get(0).unwrap().to_owned() as usize - 1).unwrap()
-									).unwrap();
-									debug!(
-										"received buddy list update command from client: {}",
-										received_buddy
-									);
-									peer.bytes.get_mut()
-										.write_all(&create_buddy_list_notify_command(received_buddy))
-										.await?;
-									debug!("sent buddy list notify command to client: {}", received_buddy);
-								}
-								20 => { // ROOMIDRQ
-									let room_name = from_utf8(
-										msg.get(4..msg.get(0).unwrap().to_owned() as usize).unwrap()
-									).unwrap();
-									debug!("received room id request command from client: {}", room_name);
-									let room_id;
-									if !room_ids.contains(&room_name.to_string()) {
-										room_ids.push(room_name.to_string());
-										room_id = room_ids.iter()
-											.position(|i| i == &room_name.to_string())
-											.unwrap();
-										trace!("inserted room '{}' as '{}'", room_name, room_id);
-									} else {
-										let position = room_ids.iter()
-											.position(|i| i == &room_name.to_string())
-											.unwrap();
-										trace!("found room '{}' as '{}'", room_name, position);
-										room_id = position;
-									}
-									trace!("room name: {}, room id: {}", room_name, room_id);
-									trace!("{:?}", room_ids);
-									peer.bytes.get_mut()
-										.write_all(&create_room_id_redirect_command(room_name, room_id))
-										.await?;
-									debug!("sent redirect id command to client: {} == {}", room_name, room_id);
-								}
-								14 => {
-									let text = from_utf8(
-										msg.get(6..msg.get(0).unwrap().to_owned() as usize).unwrap()
-									).unwrap();
-									debug!("received text command from client: {}", text);
-									let mut state = state.lock().await;
-									state.broadcast(&create_text_command(&username, text)).await;
-									debug!("broadcasted text command from client");
-								}
-								7 => { // SESSEXIT
-									debug!("received session exit command from client")
-								}
-								_ => (),
-							}
-						}
-					}
-					Some(Err(e)) => {
-						error!("error while processing messages: {}", e); break;
-					}
-					None => break,
-				}
-			}
-		}
-
-		{ // De-register client
-			state.lock().await.peers.remove(&count.to_string());
-			debug!("removed peer: {}", count)
-		}
-
-		Ok(())
-	}
-}
diff --git a/src/server_dev/room/cmd/mod.rs b/src/server_dev/room/cmd/mod.rs
deleted file mode 100644
index 1d123c0..0000000
--- a/src/server_dev/room/cmd/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod property;
-pub mod session;
diff --git a/src/server_dev/room/cmd/property.rs b/src/server_dev/room/cmd/property.rs
deleted file mode 100644
index 3135d0a..0000000
--- a/src/server_dev/room/cmd/property.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-pub fn create_property_update_command() -> [u8; 161] {
-  // Vec<u8>
-  // let mut property = Vec::with_capacity(2);
-  // property.push(0x01); // ?
-  // property.push(0x10); // Command type
-  //
-  // // Meaningful Data
-  // property.push(); // Property ID
-  // property.push(); // Flags
-  // property.push(); // Access
-  //
-  // // Insert data length as first byte.
-  // property.insert(0, property.len() as u8 + 1); // ^
-  //
-  // property // Return created array
-
-  [
-    0xA1, 0xFF, 0x10, 0x08, 0x80, 0x01, 0x07, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1B, 0x80,
-    0x01, 0x0C, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x73, 0x33, 0x64, 0x2E, 0x63, 0x6F, 0x6D, 0x1A, 0x80,
-    0x01, 0x15, 0x6D, 0x61, 0x69, 0x6C, 0x2E, 0x75, 0x73, 0x2E, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x73,
-    0x2E, 0x6E, 0x65, 0x74, 0x3A, 0x32, 0x35, 0x19, 0x80, 0x01, 0x28, 0x68, 0x74, 0x74, 0x70, 0x3A,
-    0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2D, 0x64, 0x79, 0x6E, 0x61, 0x6D, 0x69, 0x63, 0x2E, 0x75, 0x73,
-    0x2E, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x73, 0x2E, 0x6E, 0x65, 0x74, 0x2F, 0x63, 0x67, 0x69, 0x2D,
-    0x62, 0x69, 0x6E, 0x18, 0x80, 0x01, 0x1F, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F, 0x2F, 0x77, 0x77,
-    0x77, 0x2D, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x2E, 0x75, 0x73, 0x2E, 0x77, 0x6F, 0x72, 0x6C,
-    0x64, 0x73, 0x2E, 0x6E, 0x65, 0x74, 0x0F, 0x80, 0x01, 0x01, 0x33, 0x03, 0x80, 0x01, 0x02, 0x32,
-    0x34, 0x01, 0x80, 0x01, 0x0C, 0x57, 0x4F, 0x52, 0x4C, 0x44, 0x53, 0x4D, 0x41, 0x53, 0x54, 0x45,
-    0x52,
-  ]: [u8; 161]
-}
-
-pub fn create_property_request_command() -> [u8; 22] {
-  [
-    0x16, 0x01, 0x06, 0x04, 0x01, 0x30, 0x0f, 0x01, 0x33, 0x08, 0x07, 0x31, 0x30, 0x30, 0x30, 0x30,
-    0x30, 0x30, 0x03, 0x02, 0x32, 0x34,
-  ]: [u8; 22]
-}
diff --git a/src/server_dev/room/cmd/session.rs b/src/server_dev/room/cmd/session.rs
deleted file mode 100644
index dee3931..0000000
--- a/src/server_dev/room/cmd/session.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use std::str::from_utf8;
-
-use bytes::BytesMut;
-
-use crate::server::cmd::session::SessionInitializationCommand;
-
-pub fn parse_session_initialization_command(command: BytesMut) -> SessionInitializationCommand {
-  SessionInitializationCommand {
-    // protocol: command.get(4..4 + command.get(4)).unwrap().to_owned() as usize,
-    // client: "".to_string(),
-    username: from_utf8(
-      command
-        .get(25..(24 + command.get(24).unwrap().to_owned() as usize + 1))
-        .unwrap(),
-    )
-    .unwrap()
-    .to_string(),
-    // password: "".to_string()
-  }
-}
diff --git a/src/server_dev/room/mod.rs b/src/server_dev/room/mod.rs
deleted file mode 100644
index 24606ea..0000000
--- a/src/server_dev/room/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod cmd;
-pub mod server;
diff --git a/src/server_dev/room/server.rs b/src/server_dev/room/server.rs
deleted file mode 100644
index 63a13f6..0000000
--- a/src/server_dev/room/server.rs
+++ /dev/null
@@ -1,434 +0,0 @@
-use std::{
-  collections::{HashMap, HashSet},
-  error::Error,
-  io::{ErrorKind, Read, Write},
-  str::from_utf8,
-};
-
-use bytes::BytesMut;
-use mio::{
-  event::Event,
-  net::{TcpListener, TcpStream},
-  Events,
-  Interest,
-  Poll,
-  Registry,
-  Token,
-};
-
-use crate::{
-  config::get_config,
-  server::{
-    auto::cmd::{
-      property::{create_property_request_command, create_property_update_command},
-      room::create_room_id_redirect_command,
-    },
-    cmd::{
-      buddy_list::create_buddy_list_notify_command,
-      property::parse_property_set_command,
-      text::{create_text_command, create_text_command_with_action},
-    },
-    parser::get_commands_from_buffer,
-    room::cmd::session::parse_session_initialization_command,
-  },
-};
-
-const SERVER: Token = Token(0);
-
-pub struct RoomServer {
-  pub clients:     HashMap<Token, String>,
-  pub connections: HashMap<Token, TcpStream>,
-  pub room_ids:    Vec<String>,
-}
-impl RoomServer {
-  pub fn listen(&mut self, addr: &str) -> Result<(), Box<dyn Error>> {
-    let mut listener = TcpListener::bind(addr.parse().unwrap())?;
-    let mut poll = Poll::new()?;
-    let mut events = Events::with_capacity(1024);
-    let mut counter: usize = 0;
-    // let mut sockets = HashMap::new();
-    let mut requests = HashMap::new();
-    let mut buffer = [0 as u8; 1024];
-    // let mut room_ids = vec![];
-
-    poll
-      .registry()
-      .register(&mut listener, Token(0), Interest::READABLE)?;
-
-    debug!(
-      "RoomServer now listening on {}",
-      listener.local_addr().unwrap()
-    );
-
-    loop {
-      poll.poll(&mut events, None)?;
-
-      for event in &events {
-        match event.token() {
-          Token(0) => {
-            loop {
-              match listener.accept() {
-                Ok((mut stream, address)) => {
-                  counter += 1;
-                  let token = Token(counter);
-
-                  poll
-                    .registry()
-                    .register(&mut stream, token, Interest::READABLE)?;
-
-                  debug!(
-                    "registered peer with address '{}' as '{}'",
-                    address, token.0
-                  );
-
-                  // sockets.insert(token, stream);
-                  self.connections.insert(token, stream);
-                  requests.insert(token, Vec::with_capacity(192));
-                }
-                Err(ref err) if err.kind() == ErrorKind::WouldBlock => break,
-                Err(err) => {
-                  error!("unexpected error: {}", err);
-                  poll
-                    .registry()
-                    .deregister(self.connections.get_mut(&Token(counter)).unwrap())?;
-                  break;
-                }
-              }
-            }
-          }
-          token if event.is_readable() => {
-            loop {
-              let read = self.connections.get_mut(&token).unwrap().read(&mut buffer);
-              match read {
-                Ok(0) => {
-                  self.connections.remove(&token);
-                  break;
-                }
-                Ok(n) => {
-                  let req = requests.get_mut(&token).unwrap();
-                  for b in &buffer[0..n] {
-                    req.push(*b);
-                  }
-
-                  for cmd in get_commands_from_buffer(BytesMut::from(&buffer[..n])) {
-                    match cmd.get(2).unwrap() {
-                      10 => {
-                        // PROPREQ
-                        debug!("received property request command from client 'null'");
-                        self
-                          .connections
-                          .get_mut(&token)
-                          .unwrap()
-                          .write_all(&create_property_update_command())
-                          .unwrap();
-                        debug!("sent property update command to client 'null'");
-                      }
-                      6 => {
-                        // SESSINIT
-                        let local_username = parse_session_initialization_command(cmd).username;
-                        self.clients.insert(token, local_username.clone());
-                        debug!(
-                          "received session initialization command from client '{}'",
-                          local_username,
-                        );
-                        self
-                          .connections
-                          .get_mut(&token)
-                          .unwrap()
-                          .write_all(&create_property_request_command())
-                          .unwrap();
-                        debug!(
-                          "sent session initialization command to client '{}'",
-                          local_username
-                        );
-                      }
-                      15 => {
-                        // PROPSET
-                        let avatar = parse_property_set_command(cmd);
-                        debug!(
-                          "received property set command from client '{}': {}",
-                          self.clients.get(&token).unwrap(),
-                          avatar,
-                        );
-                        self
-                          .connections
-                          .get_mut(&token)
-                          .unwrap()
-                          .write_all(&create_text_command_with_action(
-                            "WORLDSMASTER",
-                            &get_config().unwrap().worldsmaster_greeting,
-                          ))
-                          .unwrap();
-                        debug!(
-                          "sent session initialization command to client '{}'",
-                          self.clients.get(&token).unwrap(),
-                        );
-                      }
-                      29 => {
-                        // BUDDYLISTUPDATE
-                        let received_buddy = from_utf8(
-                          cmd
-                            .get(4..cmd.get(0).unwrap().to_owned() as usize - 1)
-                            .unwrap(),
-                        )
-                        .unwrap();
-                        debug!(
-                          "received buddy list update command from client '{}': {}",
-                          self.clients.get(&token).unwrap(),
-                          received_buddy,
-                        );
-                        self
-                          .connections
-                          .get_mut(&token)
-                          .unwrap()
-                          .write_all(&create_buddy_list_notify_command(received_buddy))
-                          .unwrap();
-                        debug!(
-                          "sent buddy list notify command to client '{}'",
-                          self.clients.get(&token).unwrap(),
-                        );
-                      }
-                      // 20 => { // ROOMIDRQ
-                      // 	let room_name = from_utf8(
-                      // 		cmd.get(4..cmd.get(0).unwrap().to_owned() as usize).unwrap()
-                      // 	).unwrap();
-                      // 	debug!(
-                      // 		"received room id request command from client '{}': {}",
-                      // 		self.clients.get(&token).unwrap(),
-                      // 		room_name,
-                      // 	);
-                      // 	let room_id;
-                      // 	if !self.room_ids.contains(&room_name.to_string()) {
-                      // 		self.room_ids.push(room_name.to_string());
-                      // 		room_id = self.room_ids.iter()
-                      // 			.position(|i| i == &room_name.to_string())
-                      // 			.unwrap();
-                      // 		trace!("inserted room '{}' as '{}'", room_name, room_id);
-                      // 	} else {
-                      // 		let position = self.room_ids.iter()
-                      // 			.position(|i| i == &room_name.to_string())
-                      // 			.unwrap();
-                      // 		trace!("found room '{}' as '{}'", room_name, position);
-                      // 		room_id = position;
-                      // 	}
-                      // 	trace!("room name: {}, room id: {}", room_name, room_id);
-                      // 	trace!("{:?}", self.room_ids);
-                      // 	self.connections.get_mut(&token).unwrap()
-                      // 		.write_all(&create_room_id_redirect_command(
-                      // 			room_name, room_id,
-                      // 		)).unwrap();
-                      // }
-                      14 => {
-                        // TEXT
-                        let text =
-                          from_utf8(cmd.get(6..cmd.get(0).unwrap().to_owned() as usize).unwrap())
-                            .unwrap();
-                        let username = self.clients.get(&token).unwrap().clone();
-                        debug!(
-                          "received text command from client '{}': {}",
-                          username,
-                          format!("room: {}", text),
-                        );
-                        self.connections.iter_mut().for_each(|t| {
-                          t.1
-                            .write_all(&create_text_command(&username, text))
-                            .unwrap()
-                        });
-                        debug!("broadcasted text command to clients");
-                      }
-                      7 => {
-                        // SESSEXIT
-                        debug!(
-                          "received session exit command from client '{}'",
-                          self.clients.get(&token).unwrap(),
-                        );
-                      }
-                      _ => (),
-                    }
-                  }
-                }
-                Err(ref err) if err.kind() == ErrorKind::WouldBlock => break,
-                Err(err) => {
-                  error!("unexpected error: {}", err);
-                  break;
-                }
-              }
-            }
-          }
-          _ => (),
-        }
-      }
-    }
-  }
-
-  fn broadcast(sockets: &HashMap<Token, TcpStream>, cmd: &[u8]) -> () {
-    for mut socket in sockets {
-      socket.1.write_all(cmd).unwrap();
-    }
-  }
-
-  // fn process(
-  // 	&mut self,
-  // 	_registry: &Registry,
-  // 	event: &Event,
-  // 	token: Token,
-  // ) -> Result<bool, Box<dyn Error>> {
-  // 	if event.is_readable() {
-  // 		let mut connection_closed = false;
-  // 		let mut received_data = vec![0; 4096];
-  // 		let mut bytes_read = 0;
-  //
-  // 		let stream = self.connections.get_mut(&token).unwrap();
-  //
-  // 		loop {
-  // 			match stream.read(&mut received_data[bytes_read..]) {
-  // 				Ok(0) => {
-  // 					connection_closed = true;
-  // 					break;
-  // 				}
-  // 				Ok(n) => {
-  // 					bytes_read += n;
-  // 					if bytes_read ==  received_data.len() {
-  // 						received_data.resize(received_data.len() + 1024, 0);
-  // 					}
-  // 				}
-  // 				Err(ref err) if err.kind() == ErrorKind::WouldBlock => break,
-  // 				Err(ref err) if err.kind() == ErrorKind::Interrupted => continue,
-  // 				Err(err) => return Err(Box::new(err)),
-  // 			}
-  // 		}
-  //
-  // 		if bytes_read != 0 {
-  // 			self.handle(
-  // 				&mut received_data[..bytes_read],
-  // 				token,
-  // 			);
-  // 		}
-  // 		if connection_closed {
-  // 			println!("de-registered peer with token '{}'", token.0);
-  // 			return Ok(true);
-  // 		}
-  // 	}
-  //
-  // 	Ok(false)
-  // }
-
-  // fn handle(
-  // 	&mut self,
-  // 	data: &[u8],
-  // 	// stream: &mut TcpStream,
-  // 	token: Token,
-  // ) -> () {
-  // 	// trace!("i am client: {:?}", self.clients.get(&token));
-  // 	// debug!("{:?}", self.connections);
-  // 	for cmd in get_commands_from_buffer(BytesMut::from(data)) {
-  // 		debug!("received: {:?}", cmd);
-  // 		match cmd.get(2).unwrap() {
-  // 			10 => { // PROPREQ
-  // 				debug!("received property request command from client 'null'");
-  // 				self.connections.get_mut(&token).unwrap()
-  // 					.write_all(&create_property_update_command()).unwrap();
-  // 				debug!("sent property update command to client 'null'");
-  // 			}
-  // 			6 => { // SESSINIT
-  // 				let local_username =
-  // 					parse_session_initialization_command(cmd).username;
-  // 				self.clients.insert(token, local_username.clone());
-  // 				debug!(
-  // 					"received session initialization command from client '{}'",
-  // 					local_username,
-  // 				);
-  // 				self.connections.get_mut(&token).unwrap()
-  // 					.write_all(&create_property_request_command()).unwrap();
-  // 				debug!("sent session initialization command to client '{}'", local_username);
-  // 			}
-  // 			15 => { // PROPSET
-  // 				let avatar = parse_property_set_command(cmd);
-  // 				debug!(
-  // 					"received property set command from client '{}': {}",
-  // 					self.clients.get(&token).unwrap(),
-  // 					avatar,
-  // 				);
-  // 				self.connections.get_mut(&token).unwrap()
-  // 					.write_all(&create_text_command_with_action(
-  // 						"WORLDSMASTER", &get_config().unwrap().worldsmaster_greeting,
-  // 					)).unwrap();
-  // 				debug!(
-  // 					"sent session initialization command to client '{}'",
-  // 					self.clients.get(&token).unwrap(),
-  // 				);
-  // 			}
-  // 			29 =>  { // BUDDYLISTUPDATE
-  // 				let received_buddy = from_utf8(
-  // 					cmd.get(4..cmd.get(0).unwrap().to_owned() as usize - 1).unwrap()
-  // 				).unwrap();
-  // 				debug!(
-  // 					"received buddy list update command from client '{}': {}",
-  // 					self.clients.get(&token).unwrap(),
-  // 					received_buddy,
-  // 				);
-  // 				self.connections.get_mut(&token).unwrap()
-  // 					.write_all(&create_buddy_list_notify_command(received_buddy)).unwrap();
-  // 				debug!(
-  // 					"sent buddy list notify command to client '{}'",
-  // 					self.clients.get(&token).unwrap(),
-  // 				);
-  // 			}
-  // 			20 => { // ROOMIDRQ
-  // 				let room_name = from_utf8(
-  // 					cmd.get(4..cmd.get(0).unwrap().to_owned() as usize).unwrap()
-  // 				).unwrap();
-  // 				debug!(
-  // 					"received room id request command from client '{}': {}",
-  // 					self.clients.get(&token).unwrap(),
-  // 					room_name,
-  // 				);
-  // 				let room_id;
-  // 				if !self.room_ids.contains(&room_name.to_string()) {
-  // 					self.room_ids.push(room_name.to_string());
-  // 					room_id = self.room_ids.iter()
-  // 						.position(|i| i == &room_name.to_string())
-  // 						.unwrap();
-  // 					trace!("inserted room '{}' as '{}'", room_name, room_id);
-  // 				} else {
-  // 					let position = self.room_ids.iter()
-  // 						.position(|i| i == &room_name.to_string())
-  // 						.unwrap();
-  // 					trace!("found room '{}' as '{}'", room_name, position);
-  // 					room_id = position;
-  // 				}
-  // 				trace!("room name: {}, room id: {}", room_name, room_id);
-  // 				trace!("{:?}", self.room_ids);
-  // 				self.connections.get_mut(&token).unwrap()
-  // 					.write_all(&create_room_id_redirect_command(
-  // 						room_name, room_id,
-  // 					)).unwrap();
-  // 			}
-  // 			14 => { // TEXT
-  // 				let text = from_utf8(
-  // 					cmd.get(6..cmd.get(0).unwrap().to_owned() as usize).unwrap()
-  // 				).unwrap();
-  // 				let username = self.clients.get(&token).unwrap().clone();
-  // 				debug!(
-  // 					"received text command from client '{}': {}",
-  // 					username, text,
-  // 				);
-  // 				self.connections.iter_mut().for_each(|t|
-  // 					t.1.write_all(&create_text_command(
-  // 						&username,
-  // 						text,
-  // 					)).unwrap()
-  // 				);
-  // 				debug!("broadcasted text command to clients");
-  // 			}
-  // 			7 => { // SESSEXIT
-  // 				debug!(
-  // 					"received session exit command from client '{}'",
-  // 					self.clients.get(&token).unwrap(),
-  // 				);
-  // 			}
-  // 			_ => (),
-  // 		}
-  // 	}
-  // }
-}