some changes

README.md

@@ -27,13 +27,14 @@ Known issues:
 
 ## Hosting a server
 
-todo!
+See the [server readme](./server/readme.md) for more information about the server and how you can host it.
 
 ## Building
 
-Building should be the same as any other mod!
-
-todo macaroni os
+```sh
+cmake -DCMAKE_BUILD_TYPE=Release -B build
+cmake --build build --config Release
+```
 
 ## Credit
 

server/central/src/config.rs

@@ -58,7 +58,7 @@ fn default_secret_key() -> String {
         .map(char::from)
         .collect();
 
-    format!("Insecure-{}", rand_string)
+    format!("Insecure-{rand_string}")
 }
 
 fn default_challenge_expiry() -> u32 {

server/central/src/ip_blocker.rs

@@ -10,7 +10,7 @@ pub struct IpBlocker {
 }
 
 impl IpBlocker {
-    pub fn new(v4: Vec<String>, v6: Vec<String>) -> Self {
+    pub fn new(v4: &[String], v6: &[String]) -> Self {
         let range_v4 = v4.iter().map(|s| s.parse().unwrap()).collect();
         let range_v6 = v6.iter().map(|s| s.parse().unwrap()).collect();
 
@@ -44,10 +44,10 @@ lazy_static! {
             } else if proto == "v6" {
                 v6.push(range.to_string());
             } else {
-                eprintln!("ignoring invalid IP address entry: {}", line);
+                eprintln!("ignoring invalid IP address entry: {line}");
             }
         }
 
-        IpBlocker::new(v4, v6)
+        IpBlocker::new(&v4, &v6)
     };
 }

server/central/src/logger.rs

@@ -10,10 +10,10 @@ const TIME_FORMAT: &str = "[year]-[month]-[day] [hour]:[minute]:[second].[subsec
 
 impl log::Log for Logger {
     fn enabled(&self, metadata: &log::Metadata) -> bool {
-        if !metadata.target().starts_with("globed_central_server") {
-            metadata.level() <= Level::Warn
-        } else {
+        if metadata.target().starts_with("globed_central_server") {
             true
+        } else {
+            metadata.level() <= Level::Warn
         }
     }
 
@@ -37,7 +37,7 @@ impl log::Log for Logger {
                 Level::Trace => (record.level().to_string().black(), record.args().to_string().black()),
             };
 
-            println!("[{}] [{}] - {}", formatted_time, level, args,)
+            println!("[{formatted_time}] [{level}] - {args}");
         }
     }
 

server/central/src/main.rs

@@ -32,9 +32,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     // config file
 
-    let mut config_path = std::env::var("GLOBED_CONFIG_PATH")
-        .map(PathBuf::from)
-        .unwrap_or_else(|_| std::env::current_dir().unwrap());
+    let mut config_path =
+        std::env::var("GLOBED_CONFIG_PATH").map_or_else(|_| std::env::current_dir().unwrap(), PathBuf::from);
 
     if config_path.is_dir() {
         config_path = config_path.join("central-conf.json");
@@ -80,7 +79,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
             let mut state = watcher_state.state_write().await;
             let cpath = state.config_path.clone();
             match state.config.reload_in_place(&cpath) {
-                Ok(_) => {
+                Ok(()) => {
                     info!("Successfully reloaded the configuration");
                 }
                 Err(err) => {
@@ -93,8 +92,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
     // roa your favorite web app
 
     let router = web::routes::build_router();
-    let routes = router.routes(Box::leak(Box::new(mnt_point)))?;
-    let app = App::state(state).end(routes);
+    let route_list = router.routes(Box::leak(Box::new(mnt_point)))?;
+    let app = App::state(state).end(route_list);
 
     app.listen(mnt_addr, |addr| {
         info!("Globed central server launched on {addr}");

server/central/src/state.rs

@@ -61,7 +61,7 @@ impl ServerStateData {
 
     // uses hmac-sha256 to derive an auth key from user's account ID and name
     pub fn generate_authkey(&self, account_id: i32, account_name: &str) -> Vec<u8> {
-        let val = format!("{}:{}", account_id, account_name);
+        let val = format!("{account_id}:{account_name}");
 
         let mut hmac: Hmac<Sha256> = self.hmac.clone();
         hmac.update(val.as_bytes());
@@ -92,7 +92,7 @@ impl ServerStateData {
             .expect("whoops our clock went backwards")
             .as_secs();
 
-        let data = format!("{}.{}.{}", account_id, account_name, timestamp);
+        let data = format!("{account_id}.{account_name}.{timestamp}");
         let mut hmac = self.hmac.clone();
         hmac.update(data.as_bytes());
         let res = hmac.finalize();

server/central/src/web/routes/auth.rs

@@ -59,18 +59,19 @@ macro_rules! get_user_ip {
 pub async fn totp_login(context: &mut Context<ServerState>) -> roa::Result {
     check_user_agent!(context, _ua);
 
+    let state = context.state_read().await;
+    get_user_ip!(state, context, _ip);
+
     let account_id = context.must_query("aid")?.parse::<i32>()?;
     let account_name = &*context.must_query("aname")?;
     let code = &*context.must_query("code")?;
 
     // if account_name.to_lowercase().contains("sevenworks")
-    //     && rand::thread_rng().gen_ratio(1, 25) {
-
+    //     || account_name.to_lowercase() == "7works" && rand::thread_rng().gen_ratio(1, 25)
+    // {
     //     throw!(StatusCode::IM_A_TEAPOT);
     // }
 
-    let state = context.state_read().await;
-
     if state.should_block(account_id) {
         throw!(
             StatusCode::FORBIDDEN,
@@ -138,7 +139,7 @@ pub async fn challenge_start(context: &mut Context<ServerState>) -> roa::Result
         } else {
             let passed_time = current_time - challenge.started;
             // if it hasn't expired yet, throw an error
-            if passed_time.as_secs() < (state.config.challenge_expiry as u64) {
+            if passed_time.as_secs() < u64::from(state.config.challenge_expiry) {
                 throw!(
                     StatusCode::FORBIDDEN,
                     "challenge already requested for this account ID, please wait a minute and try again"
@@ -264,7 +265,7 @@ pub async fn challenge_finish(context: &mut Context<ServerState>) -> roa::Result
     // no ratelimiting in debug mode
     if !cfg!(debug_assertions) {
         match state.record_login_attempt(&user_ip) {
-            Ok(_) => {}
+            Ok(()) => {}
             Err(err) => {
                 warn!("peer is sending too many verification requests: {}", user_ip);
                 throw!(StatusCode::TOO_MANY_REQUESTS, err.to_string())
@@ -370,8 +371,6 @@ pub async fn challenge_finish(context: &mut Context<ServerState>) -> roa::Result
 
             context.write(format!("{}:{}", comment_id, b64e::STANDARD.encode(authkey)));
             return Ok(());
-        } else {
-            break;
         }
     }
 

server/central/src/web/routes/game_server.rs

@@ -30,7 +30,7 @@ macro_rules! check_user_agent {
 
         let $ua = useragent.unwrap().to_str()?;
         if !cfg!(debug_assertions) && !$ua.starts_with("globed-game-server") {
-            throw!(StatusCode::UNAUTHORIZED, "mismatched user agent");
+            throw!(StatusCode::UNAUTHORIZED, "bad request");
         }
     };
 }

server/game/src/bytebufferext.rs

@@ -127,7 +127,7 @@ impl ByteBufferExt for ByteBuffer {
 
 impl ByteBufferExtWrite for ByteBuffer {
     fn write_bool(&mut self, val: bool) {
-        self.write_u8(if val { 1u8 } else { 0u8 });
+        self.write_u8(u8::from(val));
     }
 
     fn write_byte_array(&mut self, val: &[u8]) {
@@ -152,25 +152,25 @@ impl ByteBufferExtWrite for ByteBuffer {
 
     fn write_value_vec<T: Encodable>(&mut self, val: &[T]) {
         self.write_u32(val.len() as u32);
-        for elem in val.iter() {
+        for elem in val {
             elem.encode(self);
         }
     }
 
     fn write_enum<E: Into<B>, B: Encodable>(&mut self, val: E) {
-        self.write_value(&val.into())
+        self.write_value(&val.into());
     }
 
     fn write_color3(&mut self, val: cocos::Color3B) {
-        self.write_value(&val)
+        self.write_value(&val);
     }
 
     fn write_color4(&mut self, val: cocos::Color4B) {
-        self.write_value(&val)
+        self.write_value(&val);
     }
 
     fn write_point(&mut self, val: cocos::Point) {
-        self.write_value(&val)
+        self.write_value(&val);
     }
 }
 

server/game/src/data/packets/client/game.rs

@@ -29,13 +29,9 @@ packet!(RequestProfilesPacket, 11001, false, {
 encode_unimpl!(RequestProfilesPacket);
 
 decode_impl!(RequestProfilesPacket, buf, {
-    let len = buf.read_u32()?;
-    let mut ids = Vec::new();
-    for _ in 0..len {
-        ids.push(buf.read_i32()?);
-    }
-
-    Ok(Self { ids })
+    Ok(Self {
+        ids: buf.read_value_vec()?,
+    })
 });
 
 /* LevelJoinPacket - 11002 */
@@ -66,6 +62,10 @@ encode_unimpl!(PlayerDataPacket);
 
 decode_impl!(PlayerDataPacket, buf, Ok(Self { data: buf.read_value()? }));
 
+/* RequestPlayerListPacket - 11005 */
+
+empty_client_packet!(RequestPlayerListPacket, 11005);
+
 /* VoicePacket - 11010 */
 
 packet!(VoicePacket, 11010, true, {

server/game/src/data/packets/server/game.rs

@@ -22,6 +22,18 @@ decode_unimpl!(PlayerProfilesPacket);
 
 empty_server_packet!(LevelDataPacket, 21001);
 
+/* PlayerListPacket - 21002 */
+
+packet!(PlayerListPacket, 21002, false, {
+    profiles: Vec<PlayerAccountData>,
+});
+
+encode_impl!(PlayerListPacket, buf, self, {
+    buf.write_value_vec(&self.profiles);
+});
+
+decode_unimpl!(PlayerListPacket);
+
 /* VoiceBroadcastPacket - 21010 */
 
 packet!(VoiceBroadcastPacket, 21010, true, {

server/game/src/data/types/gd.rs

@@ -6,18 +6,18 @@ use super::Color3B;
 
 #[derive(Clone)]
 pub struct PlayerIconData {
-    pub cube: i32,
-    pub ship: i32,
-    pub ball: i32,
-    pub ufo: i32,
-    pub wave: i32,
-    pub robot: i32,
-    pub spider: i32,
-    pub swing: i32,
-    pub jetpack: i32,
-    pub death_effect: i32,
-    pub color1: i32,
-    pub color2: i32,
+    pub cube: i16,
+    pub ship: i16,
+    pub ball: i16,
+    pub ufo: i16,
+    pub wave: i16,
+    pub robot: i16,
+    pub spider: i16,
+    pub swing: i16,
+    pub jetpack: i16,
+    pub death_effect: i16,
+    pub color1: i16,
+    pub color2: i16,
 }
 
 impl Default for PlayerIconData {
@@ -40,33 +40,33 @@ impl Default for PlayerIconData {
 }
 
 encode_impl!(PlayerIconData, buf, self, {
-    buf.write_i32(self.cube);
-    buf.write_i32(self.ship);
-    buf.write_i32(self.ball);
-    buf.write_i32(self.ufo);
-    buf.write_i32(self.wave);
-    buf.write_i32(self.robot);
-    buf.write_i32(self.spider);
-    buf.write_i32(self.swing);
-    buf.write_i32(self.jetpack);
-    buf.write_i32(self.death_effect);
-    buf.write_i32(self.color1);
-    buf.write_i32(self.color2);
+    buf.write_i16(self.cube);
+    buf.write_i16(self.ship);
+    buf.write_i16(self.ball);
+    buf.write_i16(self.ufo);
+    buf.write_i16(self.wave);
+    buf.write_i16(self.robot);
+    buf.write_i16(self.spider);
+    buf.write_i16(self.swing);
+    buf.write_i16(self.jetpack);
+    buf.write_i16(self.death_effect);
+    buf.write_i16(self.color1);
+    buf.write_i16(self.color2);
 });
 
 decode_impl!(PlayerIconData, buf, {
-    let cube = buf.read_i32()?;
-    let ship = buf.read_i32()?;
-    let ball = buf.read_i32()?;
-    let ufo = buf.read_i32()?;
-    let wave = buf.read_i32()?;
-    let robot = buf.read_i32()?;
-    let spider = buf.read_i32()?;
-    let swing = buf.read_i32()?;
-    let jetpack = buf.read_i32()?;
-    let death_effect = buf.read_i32()?;
-    let color1 = buf.read_i32()?;
-    let color2 = buf.read_i32()?;
+    let cube = buf.read_i16()?;
+    let ship = buf.read_i16()?;
+    let ball = buf.read_i16()?;
+    let ufo = buf.read_i16()?;
+    let wave = buf.read_i16()?;
+    let robot = buf.read_i16()?;
+    let spider = buf.read_i16()?;
+    let swing = buf.read_i16()?;
+    let jetpack = buf.read_i16()?;
+    let death_effect = buf.read_i16()?;
+    let color1 = buf.read_i16()?;
+    let color2 = buf.read_i16()?;
     Ok(Self {
         cube,
         ship,

server/game/src/logger.rs

@@ -10,10 +10,10 @@ const TIME_FORMAT: &str = "[year]-[month]-[day] [hour]:[minute]:[second].[subsec
 
 impl log::Log for Logger {
     fn enabled(&self, metadata: &log::Metadata) -> bool {
-        if !metadata.target().starts_with("globed_game_server") {
-            metadata.level() <= Level::Warn
-        } else {
+        if metadata.target().starts_with("globed_game_server") {
             true
+        } else {
+            metadata.level() <= Level::Warn
         }
     }
 
@@ -37,7 +37,7 @@ impl log::Log for Logger {
                 Level::Trace => (record.level().to_string().black(), record.args().to_string().black()),
             };
 
-            println!("[{}] [{}] - {}", formatted_time, level, args,)
+            println!("[{formatted_time}] [{level}] - {args}");
         }
     }