aboutsummaryrefslogtreecommitdiff
path: root/src/server/auto
diff options
context:
space:
mode:
authorFuwn <[email protected]>2021-04-26 13:26:53 +0000
committerFuwn <[email protected]>2021-04-26 13:26:53 +0000
commit6bf261e243b11b376a0cbfbe9ab6f9d6cb398aed (patch)
tree326e64552b6223d21feb3cc5b525f792e252ccc1 /src/server/auto
parentetc: Prepend license identifier to *most* files (diff)
downloadwhirl-6bf261e243b11b376a0cbfbe9ab6f9d6cb398aed.tar.xz
whirl-6bf261e243b11b376a0cbfbe9ab6f9d6cb398aed.zip
etc: Remove legacy server module
Diffstat (limited to 'src/server/auto')
-rw-r--r--src/server/auto/____server.rs384
-rw-r--r--src/server/auto/___server.rs266
-rw-r--r--src/server/auto/__server.rs230
-rw-r--r--src/server/auto/_server.rs182
-rw-r--r--src/server/auto/cmd/mod.rs3
-rw-r--r--src/server/auto/cmd/property.rs24
-rw-r--r--src/server/auto/cmd/room.rs33
-rw-r--r--src/server/auto/cmd/session.rs36
-rw-r--r--src/server/auto/mod.rs2
-rw-r--r--src/server/auto/server.rs319
10 files changed, 0 insertions, 1479 deletions
diff --git a/src/server/auto/____server.rs b/src/server/auto/____server.rs
deleted file mode 100644
index 586bc16..0000000
--- a/src/server/auto/____server.rs
+++ /dev/null
@@ -1,384 +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::auto::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;
-
-const SERVER: Token = Token(0);
-
-pub struct AutoServer {
- pub clients: HashMap<Token, String>,
- pub connections: HashMap<Token, TcpStream>,
- pub room_ids: Vec<String>,
-}
-impl AutoServer {
- 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!("AutoServer 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, 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/auto/___server.rs b/src/server/auto/___server.rs
deleted file mode 100644
index 2f95952..0000000
--- a/src/server/auto/___server.rs
+++ /dev/null
@@ -1,266 +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::auto::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;
-use mio::event::Event;
-use std::io::{Read, ErrorKind, Write};
-use bytes::BytesMut;
-
-const SERVER: Token = Token(0);
-
-pub struct AutoServer {
- pub clients: HashMap<Token, String>,
- pub connections: HashMap<Token, TcpStream>,
- pub room_ids: Vec<String>,
-}
-impl AutoServer {
- pub fn listen(&mut self, addr: &str) -> Result<(), Box<dyn Error>> {
- let mut server = TcpListener::bind(addr.parse().unwrap())?;
- let mut poll = Poll::new()?;
- let mut events = Events::with_capacity(1024);
- let mut unique_token = Token(SERVER.0 + 1);
-
- poll.registry().register(
- &mut server,
- SERVER,
- Interest::READABLE
- )?;
-
- debug!("AutoServer now listening on {}", server.local_addr().unwrap());
-
- loop {
- poll.poll(&mut events, None)?;
-
- for event in &events {
- match event.token() {
- SERVER => loop {
- let (mut stream, address) = match server.accept() {
- Ok((stream, address)) => (stream, address),
- Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => break,
- Err(e) => return Err(Box::new(e)),
- };
-
- let token = AutoServer::next(&mut unique_token);
- poll.registry().register(
- &mut stream,
- token,
- Interest::READABLE, //.add(Interest::WRITABLE),
- )?;
-
- self.connections.insert(token, stream);
-
- debug!("registered peer with address '{}' as '{}'", address, token.0);
- },
- token => {
- // let done = if let Some(stream) = self.connections.get_mut(&token) {
- // self.process(
- // poll.registry(),
- // event,
- // token,
- // )?
- // } else {
- // false
- // };
-
- let done = self.process(
- poll.registry(),
- event,
- token,
- )?;
- if done { self.connections.remove(&token); }
- }
- }
- }
- }
- }
-
- fn next(current: &mut Token) -> Token {
- let next = current.0;
- current.0 += 1;
- Token(next)
- }
-
- fn broadcast(mut self, cmd: &[u8]) -> () {
- self.connections.iter_mut()
- .for_each(|c|
- c.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/auto/__server.rs b/src/server/auto/__server.rs
deleted file mode 100644
index b72b7e7..0000000
--- a/src/server/auto/__server.rs
+++ /dev/null
@@ -1,230 +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::auto::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;
-use mio::event::Event;
-use std::io::{Read, ErrorKind, Write};
-use bytes::BytesMut;
-
-const SERVER: Token = Token(0);
-
-pub struct AutoServer {
- pub clients: HashMap<Token, String>,
- pub connections: HashMap<Token, TcpStream>,
-}
-impl AutoServer {
- pub fn listen(&mut self, addr: &str) -> Result<(), Box<dyn Error>> {
- let mut server = TcpListener::bind(addr.parse().unwrap())?;
- let mut poll = Poll::new()?;
- let mut events = Events::with_capacity(1024);
- let mut connections = HashMap::new();
- let mut unique_token = Token(SERVER.0 + 1);
-
- poll.registry().register(
- &mut server,
- SERVER,
- Interest::READABLE
- )?;
-
- debug!("AutoServer now listening on {}", server.local_addr().unwrap());
-
- loop {
- poll.poll(&mut events, None)?;
-
- for event in events.iter() {
- match event.token() {
- SERVER => loop {
- let (mut stream, address) = match server.accept() {
- Ok((stream, address)) => (stream, address),
- Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => break,
- Err(e) => return Err(Box::new(e)),
- };
-
- let token = AutoServer::next(&mut unique_token);
- poll.registry().register(
- &mut stream,
- token,
- Interest::READABLE, //.add(Interest::WRITABLE),
- )?;
-
- connections.insert(token, stream);
-
- println!("registered peer with address '{}' as '{}'", address, token.0);
- },
- token => {
- let done = if let Some(stream) = connections.get_mut(&token) {
- self.process(
- poll.registry(),
- stream,
- event,
- token,
- )?
- } else {
- false
- };
- if done { connections.remove(&token); }
- }
- }
- }
- }
- }
-
- fn next(current: &mut Token) -> Token {
- let next = current.0;
- current.0 += 1;
- Token(next)
- }
-
- fn broadcast(self, cmd: &[u8]) -> () {
- for mut connection in self.connections {
- connection.1.write(cmd).unwrap();
- }
- }
-
- fn process(
- &mut self,
- _registry: &Registry,
- stream: &mut TcpStream,
- 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;
-
- 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],
- stream,
- token,
- );
- }
- if connection_closed {
- debug!("connection closed");
- return Ok(true);
- }
- }
-
- Ok(false)
- }
-
- fn handle(
- &mut self,
- data: &[u8],
- stream: &mut TcpStream,
- token: Token,
- ) -> () {
- trace!("i am client: {:?}", self.clients.get(&token));
- // let local_client = self.clients.get(&token)
- // .unwrap_or(&"null".to_string());
- 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'");
- stream.write_all(&create_property_update_command()).unwrap();
- debug!("sent property update command to client 'null'");
- }
- 6 => { // SESSINIT
- let username =
- parse_session_initialization_command(cmd).username;
- self.clients.insert(token, username.clone());
- debug!(
- "received session initialization command from client '{}'",
- username,
- );
- stream.write_all(&create_property_request_command()).unwrap();
- debug!("sent session initialization command to client '{}'", username);
- }
- 15 => { // PROPSET
- let avatar = parse_property_set_command(cmd);
- debug!(
- "received property set command from client '{}': {}",
- self.clients.get(&token).unwrap(),
- avatar
- );
- stream.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
- );
- stream.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,
- );
- }
- 14 => { // TEXT
- let text = from_utf8(
- cmd.get(6..cmd.get(0).unwrap().to_owned() as usize).unwrap()
- ).unwrap();
- debug!(
- "received text command from client '{}': {}",
- self.clients.get(&token).unwrap(),
- text,
- );
- 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/auto/_server.rs b/src/server/auto/_server.rs
deleted file mode 100644
index 8b7fa6c..0000000
--- a/src/server/auto/_server.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use std::error::Error;
-use tokio::net::{TcpListener, TcpStream};
-use tokio::io::AsyncWriteExt;
-use crate::server::auto::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::auto::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 crate::server::cmd::action::create_action_command;
-
-pub struct AutoServer;
-impl AutoServer {
- pub async fn listen(addr: &str) -> Result<(), Box<dyn Error>> {
- let listener = TcpListener::bind(addr).await?;
- debug!("AutoServer 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) = AutoServer::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(
- "WORLDSMASTER", &get_config()?.worldsmaster_greeting
- )).await?;
- peer.bytes.get_mut()
- .write_all(&create_action_command()).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
- );
- let buddies = vec![
- "dosfox",
- "Fallen_Angel",
- "Internet_Man",
- "Nexialist",
- "SirGemini",
- "SirGrandpa",
- "Wirlaburla",
- ];
- if buddies.contains(&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/auto/cmd/mod.rs b/src/server/auto/cmd/mod.rs
deleted file mode 100644
index d2345c6..0000000
--- a/src/server/auto/cmd/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod property;
-pub mod room;
-pub mod session;
diff --git a/src/server/auto/cmd/property.rs b/src/server/auto/cmd/property.rs
deleted file mode 100644
index e266757..0000000
--- a/src/server/auto/cmd/property.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-pub fn create_property_update_command() -> [u8; 147] {
- [
- 0x93, 0xFF, 0x10, 0x1B, 0x80, 0x01, 0x0C, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x73, 0x33, 0x64, 0x2E,
- 0x63, 0x6F, 0x6D, 0x1A, 0x80, 0x01, 0x12, 0x6D, 0x61, 0x69, 0x6C, 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, 0x31, 0x03, 0x80, 0x01,
- 0x02, 0x32, 0x34, 0x01, 0x80, 0x01, 0x0C, 0x57, 0x4F, 0x52, 0x4C, 0x44, 0x53, 0x4D, 0x41, 0x53,
- 0x54, 0x45, 0x52,
- ]: [u8; 147]
-}
-
-pub fn create_property_request_command() -> [u8; 61] {
- [
- 0x3D, 0x01, 0x06, 0x04, 0x01, 0x30, 0x01, 0x0C, 0x57, 0x4F, 0x52, 0x4C, 0x44, 0x53, 0x4D, 0x41,
- 0x53, 0x54, 0x45, 0x52, 0x03, 0x02, 0x32, 0x34, 0x0F, 0x01, 0x31, 0x0A, 0x10,
- // VAR_SERIAL: DWLV000000000000
- 0x44, 0x57, 0x4c, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x16, 0x01, 0x30, 0x05, 0x0B, 0x64, 0x69, 0x6D, 0x65, 0x6E, 0x73, 0x69, 0x6F, 0x6E, 0x2D, 0x31,
- ]: [u8; 61]
-}
diff --git a/src/server/auto/cmd/room.rs b/src/server/auto/cmd/room.rs
deleted file mode 100644
index 79786ef..0000000
--- a/src/server/auto/cmd/room.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-pub fn create_room_id_redirect_command(room_name: &str, room_id: usize) -> Vec<u8> {
- let mut room_id_redirect = vec![
- 0x01, // ?
- 0x1A, // Command type
- ];
-
- // room_id_redirect.push(room_id_redirect.len() as u8 + 1); // Data length
- room_id_redirect.push(room_name.len() as u8); // UTF/ room name length
- for i in room_name.bytes() {
- room_id_redirect.push(i);
- } // Push `room_name`
- // for i in "<dimension-1>".bytes() { room_id_redirect.push(i); } // Push room
- // number
-
- // Room number
- room_id_redirect.push(0x00);
- room_id_redirect.push(room_id as u8);
-
- // IP
- room_id_redirect.push(0x00);
- room_id_redirect.push(0x00);
- room_id_redirect.push(0x00);
- room_id_redirect.push(0x00);
-
- // Port
- for byte in 5673_u16.to_be_bytes().iter() {
- room_id_redirect.push(*byte);
- }
-
- room_id_redirect.insert(0, room_id_redirect.len() as u8 + 1); // Data length
-
- room_id_redirect
-}
diff --git a/src/server/auto/cmd/session.rs b/src/server/auto/cmd/session.rs
deleted file mode 100644
index 19969dc..0000000
--- a/src/server/auto/cmd/session.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use std::str::from_utf8;
-
-use bytes::BytesMut;
-
-use crate::server::cmd::session::SessionInitializationCommand;
-
-struct _SessionInitializationCommandServer {
- pub error: usize,
- pub app_name: String,
- pub protocol: usize,
- pub server_type: usize,
- pub serial: String,
- pub private: usize,
- pub channel: String,
-}
-
-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(21..(20 + command.get(20).unwrap().to_owned() as usize + 1))
- .unwrap(),
- )
- .unwrap()
- .to_string(),
- // password: "".to_string()
- }
-}
-
-// pub fn create_session_initialization_command() ->
-// SessionInitializationCommandServer { SessionInitializationCommandServer {
-//
-// }
-// }
diff --git a/src/server/auto/mod.rs b/src/server/auto/mod.rs
deleted file mode 100644
index 24606ea..0000000
--- a/src/server/auto/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod cmd;
-pub mod server;
diff --git a/src/server/auto/server.rs b/src/server/auto/server.rs
deleted file mode 100644
index 164b271..0000000
--- a/src/server/auto/server.rs
+++ /dev/null
@@ -1,319 +0,0 @@
-use std::{
- collections::HashMap,
- error::Error,
- io::{ErrorKind, Read, Write},
- ops::Deref,
- 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,
- session::parse_session_initialization_command,
- },
- cmd::{
- action::create_action_command,
- 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,
- },
-};
-
-const SERVER: Token = Token(0);
-
-pub struct AutoServer {
- pub clients: HashMap<Token, String>,
- pub connections: HashMap<Token, TcpStream>,
- pub room_ids: Vec<String>,
-}
-impl AutoServer {
- pub fn listen(&mut self, addr: &str) -> Result<(), Box<dyn Error>> {
- let mut server = TcpListener::bind(addr.parse().unwrap())?;
- let mut poll = Poll::new()?;
- let mut events = Events::with_capacity(1024);
- let mut unique_token = Token(SERVER.0 + 1);
-
- poll
- .registry()
- .register(&mut server, SERVER, Interest::READABLE)?;
-
- debug!(
- "AutoServer now listening on {}",
- server.local_addr().unwrap()
- );
-
- loop {
- poll.poll(&mut events, None)?;
-
- for event in &events {
- match event.token() {
- SERVER => {
- loop {
- let (mut stream, address) = match server.accept() {
- Ok((stream, address)) => (stream, address),
- Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => break,
- Err(e) => return Err(Box::new(e)),
- };
-
- let token = AutoServer::next(&mut unique_token);
- poll.registry().register(
- &mut stream,
- token,
- Interest::READABLE, //.add(Interest::WRITABLE),
- )?;
-
- self.connections.insert(token, stream);
-
- debug!(
- "registered peer with address '{}' as '{}'",
- address, token.0
- );
- }
- }
- token => {
- let done = self.process(poll.registry(), event, token)?;
- if done {
- self.connections.remove(&token);
- }
- }
- }
- }
- }
- }
-
- fn next(current: &mut Token) -> Token {
- let next = current.0;
- current.0 += 1;
- Token(next)
- }
-
- fn broadcast(mut self, cmd: &[u8]) -> () {
- self
- .connections
- .iter_mut()
- .for_each(|c| c.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], 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(
- "WORLDSMASTER",
- &get_config().unwrap().worldsmaster_greeting,
- ))
- .unwrap();
- self
- .connections
- .get_mut(&token)
- .unwrap()
- .write_all(&create_action_command())
- .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,
- );
- let buddies = vec![
- "dosfox",
- "Fallen_Angel",
- "Internet_Man",
- "Nexialist",
- "SirGemini",
- "SirGrandpa",
- "Wirlaburla",
- ];
- if buddies.contains(&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!("auto {}", 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(),
- );
- }
- _ => (),
- }
- }
- }
-}