Cleanup, bot rebalancing WIP.

SoftbearStudios · Aug 20, 2023 · 391bac1 · 391bac1
1 parent 326652c
commit 391bac1
Show file tree

Hide file tree

Showing 19 changed files with 431 additions and 290 deletions.
diff --git a/README.md b/README.md
@@ -24,13 +24,11 @@ rustup target add wasm32-unknown-unknown
 3. `trunk build --release` in `/client`
 4. `cargo run --release` in `/server`
 
-## HTTPS
-
-If you build the server in `--release` mode, it will force HTTPS using a self-signed certificate.
-
-Optionally, specify `--certificate-path` and `--private-key-path` to use a trusted CA certificate (e.g. acquired via [Let's Encrypt](https://letsencrypt.org/)). The server will periodically check for and load renewed certificates.
-
 ## Official Server(s)
 
 To avoid potential visibility-cheating, you are prohibited from using the open-source
-client to play on official Kiomet server(s).
+client to play on official Kiomet server(s).
+
+## Trademark
+
+Kiomet is a trademark of Softbear, Inc.
diff --git a/assets/branding/app.png b/assets/branding/app.png
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -25,7 +25,7 @@ sprite_sheet = { path = "../engine/sprite_sheet" }
 strum = { version = "0.24.1" }
 stylist = { version = "0.12.1", default-features = false }
 yew = "0.20"
-yew_frontend = { path = "../engine/yew_frontend" }
+yew_frontend = { path = "../engine/yew_frontend", features = ["audio"] }
 yew_icons = { version = "0.7", features = [
     "BootstrapExclamationTriangleFill",
     "FontAwesomeSolidLocationCrosshairs",

diff --git a/common/src/protocol.rs b/common/src/protocol.rs
@@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
 
 pub use diff::Diff;
 
-#[derive(Clone, Encode, Decode)]
+#[derive(Clone, Debug, Encode, Decode)]
 pub enum Command {
     Alliance {
         with: PlayerId,

diff --git a/engine/core_protocol/src/plasma.rs b/engine/core_protocol/src/plasma.rs
@@ -167,7 +167,10 @@ pub enum PlasmaRequestV1 {
 #[cfg_attr(feature = "server", rtype(result = "()"))]
 pub enum PlasmaUpdate {
     /// Version 1 protocol.
-    V1(Box<[PlasmaUpdateV1]>),
+    V1(
+        #[serde(deserialize_with = "crate::serde_util::box_slice_skip_invalid")]
+        Box<[PlasmaUpdateV1]>,
+    ),
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]

diff --git a/engine/core_protocol/src/serde_util.rs b/engine/core_protocol/src/serde_util.rs
@@ -4,6 +4,7 @@
 use serde::de::Visitor;
 use serde::{de, Deserialize, Deserializer};
 use std::fmt;
+use std::marker::PhantomData;
 
 pub fn is_default<T: Default + PartialEq>(x: &T) -> bool {
     x == &T::default()
@@ -168,3 +169,43 @@ impl<'de> Visitor<'de> for StrVisitor {
         Ok(String::from(value))
     }
 }
+
+pub fn box_slice_skip_invalid<'de, T: Deserialize<'de>, D>(
+    deserializer: D,
+) -> Result<Box<[T]>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    #[derive(serde::Deserialize)]
+    #[serde(untagged, bound(deserialize = "T: Deserialize<'de>"))]
+    enum Item<T> {
+        Valid(T),
+        Skip(serde::de::IgnoredAny),
+    }
+
+    struct SeqVisitor<T>(PhantomData<T>);
+
+    impl<'de, T: Deserialize<'de>> serde::de::Visitor<'de> for SeqVisitor<T> {
+        type Value = Box<[T]>;
+
+        fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+            formatter.write_str("a sequence")
+        }
+
+        fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+        where
+            A: serde::de::SeqAccess<'de>,
+        {
+            let mut values = Vec::with_capacity(seq.size_hint().unwrap_or_default().min(32));
+            while let Some(value) = seq.next_element()? {
+                if let Item::<T>::Valid(value) = value {
+                    values.push(value);
+                }
+            }
+            Ok(values.into_boxed_slice())
+        }
+    }
+
+    let visitor = SeqVisitor::<T>(PhantomData);
+    deserializer.deserialize_seq(visitor)
+}
diff --git a/engine/game_server/Cargo.toml b/engine/game_server/Cargo.toml
@@ -2,7 +2,7 @@
 name = "game_server"
 workspace = ".."
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 authors = ["Softbear, Inc."]
 license = "AGPL-3.0-or-later"
 

diff --git a/engine/game_server/src/bot.rs b/engine/game_server/src/bot.rs
@@ -20,7 +20,7 @@ impl<G: GameArenaService> BotData<G> {
         Self {
             bot: G::Bot::default(),
             player_tuple: Arc::new(player_tuple),
-            action_buffer: BotAction::None,
+            action_buffer: BotAction::default(),
         }
     }
 }
@@ -72,7 +72,8 @@ impl<G: GameArenaService> BotRepo<G> {
                     update,
                     bot_data.player_tuple.player.borrow().player_id,
                     players,
-                )
+                );
+                //println!("{:?}", bot_data.action_buffer);
             });
     }
 
@@ -83,7 +84,7 @@ impl<G: GameArenaService> BotRepo<G> {
                 BotAction::Some(command) => {
                     let _ = service.player_command(command, &bot_data.player_tuple, players);
                 }
-                BotAction::None => {}
+                BotAction::None(_) => {}
                 BotAction::Quit => {
                     // Recycle.
                     service.player_left(&bot_data.player_tuple, players);

diff --git a/engine/game_server/src/client.rs b/engine/game_server/src/client.rs
@@ -128,7 +128,7 @@ impl<G: GameArenaService> ClientRepo<G> {
         let player_tuple = match players.get(player_id) {
             Some(player_tuple) => player_tuple,
             None => {
-                debug_assert!(false, "client gone in register");
+                debug_assert!(false, "client {player_id:?} gone in register");
                 return;
             }
         };
@@ -972,6 +972,7 @@ impl<G: GameArenaService> Handler<ObserverMessage<Request<G::GameRequest>, Updat
         _ctx: &mut Self::Context,
     ) {
         let Some(context_service) = self.arenas.get_mut(msg.realm_name) else {
+            error!("missing realm {:?}", msg.realm_name);
             match msg.body {
                 ObserverMessageBody::Register { observer, .. } => {
                     let _ = observer.send(ObserverUpdate::Close);
@@ -995,7 +996,7 @@ impl<G: GameArenaService> Handler<ObserverMessage<Request<G::GameRequest>, Updat
                 #[cfg(feature = "teams")]
                 &mut context_service.context.teams,
                 &context_service.context.chat,
-                &self.leaderboard,
+                &context_service.context.leaderboard,
                 &context_service.context.liveboard,
                 &mut self.metrics,
                 &self.system,
@@ -1103,6 +1104,7 @@ impl<G: GameArenaService> Handler<Authenticate> for Infrastructure<G> {
 
         let realm_name = msg.realm_name;
         let Some(context_service) = self.arenas.get_mut(realm_name) else {
+            log::warn!("no arena {realm_name:?}");
             return Err("no such arena");
         };
         let arena_token = context_service.context.token;

diff --git a/engine/game_server/src/context.rs b/engine/game_server/src/context.rs
@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2021 Softbear, Inc.
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-use crate::bot::BotRepo;
 use crate::chat::ChatRepo;
 use crate::game_service::GameArenaService;
 use crate::liveboard::LiveboardRepo;
 use crate::player::PlayerRepo;
 #[cfg(feature = "teams")]
 use crate::team::TeamRepo;
+use crate::{bot::BotRepo, leaderboard::LeaderboardRepo};
 use core_protocol::ArenaToken;
 use rand::{thread_rng, Rng};
 
@@ -20,6 +20,7 @@ pub struct Context<G: GameArenaService> {
     #[cfg(feature = "teams")]
     pub teams: TeamRepo<G>,
     pub(crate) liveboard: LiveboardRepo<G>,
+    pub(crate) leaderboard: LeaderboardRepo<G>,
 }
 
 impl<G: GameArenaService> Context<G> {
@@ -32,6 +33,7 @@ impl<G: GameArenaService> Context<G> {
             teams: TeamRepo::default(),
             chat: ChatRepo::new(chat_log),
             liveboard: LiveboardRepo::default(),
+            leaderboard: LeaderboardRepo::default(),
         }
     }
 }
diff --git a/engine/game_server/src/context_service.rs b/engine/game_server/src/context_service.rs
@@ -6,7 +6,6 @@ use crate::client::ClientRepo;
 use crate::context::Context;
 use crate::game_service::GameArenaService;
 use crate::invitation::InvitationRepo;
-use crate::leaderboard::LeaderboardRepo;
 use crate::metric::MetricRepo;
 use crate::plasma::PlasmaClient;
 use core_protocol::dto::ServerDto;
@@ -39,7 +38,6 @@ impl<G: GameArenaService> ContextService<G> {
     pub(crate) fn update(
         &mut self,
         clients: &mut ClientRepo<G>,
-        leaderboard: &mut LeaderboardRepo<G>,
         invitations: &mut InvitationRepo<G>,
         metrics: &mut MetricRepo<G>,
         server_delta: &Option<(Arc<[ServerDto]>, Arc<[ServerNumber]>)>,
@@ -78,18 +76,22 @@ impl<G: GameArenaService> ContextService<G> {
             #[cfg(feature = "teams")]
             &mut self.context.teams,
             &mut self.context.liveboard,
-            leaderboard,
+            &self.context.leaderboard,
             server_delta,
         );
         self.context
             .bots
             .update(&self.service, &self.context.players);
 
-        leaderboard.process(&self.context.liveboard, &self.context.players);
+        self.context
+            .leaderboard
+            .process(&self.context.liveboard, &self.context.players);
 
         // Post-update game logic.
         self.service.post_update(&mut self.context);
 
+        self.context.leaderboard.clear_deltas();
+
         // Bot commands/joining/leaving, postponed because no commands should be issued between
         // `GameService::tick` and `GameService::post_update`.
         self.context