From 58795eb87e1ad0a29d541bb0bd5a0524dd764ddd Mon Sep 17 00:00:00 2001
From: Michael Bradley <michaelmbrad@gmail.com>
Date: Sat, 5 Jul 2025 19:28:14 -0400
Subject: [PATCH 1/4] Don't expose heartbeat to app

---
 src/game/net.rs   | 1 -
 src/net/io.rs     | 6 ++++--
 src/net/peer.rs   | 2 +-
 src/net/plugin.rs | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/game/net.rs b/src/game/net.rs
index 2cde3b5..524b376 100644
--- a/src/game/net.rs
+++ b/src/game/net.rs
@@ -11,7 +11,6 @@ pub fn handle_new_peer(
 ) {
     if let Some(seed) = seed {
         for peer in new_peers {
-            warn!("Sending seed to peer: {}", peer.uuid);
             outbound.write(OutboundPacket(Packet::new((*seed).into(), peer.uuid)));
         }
     }
diff --git a/src/net/io.rs b/src/net/io.rs
index d02a3da..7dcceca 100644
--- a/src/net/io.rs
+++ b/src/net/io.rs
@@ -26,7 +26,9 @@ pub fn handle_network_input(
             .into());
         }
         let uuid = Uuid::from_slice(message.split_off(message.len() - 16).as_slice())?;
-        to_app.write(InboundPacket(Packet::new(message, uuid)));
+        if !message.is_empty() {
+            to_app.write(InboundPacket(Packet::new(message, uuid)));
+        }
         if let Some(peer_id) = peer_map.get(&uuid) {
             let (peer, mut last) = peers.get_mut(*peer_id)?;
             last.update(&time);
@@ -74,7 +76,7 @@ pub fn heartbeat(
     }
 }
 
-pub fn timeouts(
+pub fn timeout(
     peers: Query<(&Peer, &PeerReceiveTiming)>,
     time: Res<Time>,
     mut delete: EventWriter<PeerChangeEvent>,
diff --git a/src/net/peer.rs b/src/net/peer.rs
index 650ee32..097d8b7 100644
--- a/src/net/peer.rs
+++ b/src/net/peer.rs
@@ -107,7 +107,7 @@ pub fn handle_peer_change(
                 peer_map.remove(&change.peer);
             }
         } else if let Some(addr) = change.addr {
-            info!("Adding peer {} ({:?})", change.peer, change.addr);
+            info!("Adding peer {} ({})", change.peer, addr);
             peer_map.insert(
                 change.peer,
                 commands
diff --git a/src/net/plugin.rs b/src/net/plugin.rs
index 8d3064a..bbe807f 100644
--- a/src/net/plugin.rs
+++ b/src/net/plugin.rs
@@ -4,7 +4,7 @@ use bevy::prelude::*;
 use uuid::Uuid;
 
 use super::{
-    io::{Config, handle_network_input, handle_network_output, heartbeat, timeouts},
+    io::{Config, handle_network_input, handle_network_output, heartbeat, timeout},
     packet::{InboundPacket, OutboundPacket},
     peer::{Peer, PeerChangeEvent, PeerMap, handle_new_peer, handle_peer_change},
     queues::{NetworkReceive, NetworkSend},
@@ -40,7 +40,7 @@ impl Plugin for NetIOPlugin {
             )
             .add_systems(
                 FixedUpdate,
-                (heartbeat, timeouts, handle_new_peer).run_if(in_state(NetworkState::MultiPlayer)),
+                (heartbeat, timeout, handle_new_peer).run_if(in_state(NetworkState::MultiPlayer)),
             )
             .add_systems(
                 FixedPostUpdate,

From e883f201c0795ca50a5dd28ca2b88aa5c225e32d Mon Sep 17 00:00:00 2001
From: Michael Bradley <michaelmbrad@gmail.com>
Date: Sat, 5 Jul 2025 21:36:17 -0400
Subject: [PATCH 2/4] Add Seed display

---
 src/game/mod.rs    |  1 +
 src/game/plugin.rs |  8 ++++++--
 src/game/setup.rs  |  2 +-
 src/game/ui.rs     | 31 +++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 src/game/ui.rs

diff --git a/src/game/mod.rs b/src/game/mod.rs
index 02dda3b..e4efe5d 100644
--- a/src/game/mod.rs
+++ b/src/game/mod.rs
@@ -6,6 +6,7 @@ mod runtime;
 mod seed;
 mod setup;
 pub mod state;
+mod ui;
 
 #[allow(unused_imports)]
 pub mod prelude {
diff --git a/src/game/plugin.rs b/src/game/plugin.rs
index 27242d6..8929879 100644
--- a/src/game/plugin.rs
+++ b/src/game/plugin.rs
@@ -9,8 +9,11 @@ use super::{
     net::{handle_deleted_peer, handle_incoming_packets, handle_new_peer},
     runtime::{move_camera, move_player, quit, zoom_camera},
     seed::Seed,
-    setup::{check_for_seed, setup_balls, setup_from_seed, setup_player, setup_ui, setup_walls},
+    setup::{
+        check_for_seed, setup_balls, setup_camera, setup_from_seed, setup_player, setup_walls,
+    },
     state::AppState,
+    ui::{setup_seed_display, update_seed_display},
 };
 
 #[derive(Debug, Clone, Copy)]
@@ -56,7 +59,7 @@ impl Plugin for GamePlugin {
             PhysicsPlugins::default().with_length_unit(50.0),
         ))
         .init_state::<AppState>()
-        .add_systems(Startup, setup_ui)
+        .add_systems(Startup, (setup_camera, setup_seed_display))
         .add_systems(
             OnEnter(AppState::InGame),
             (
@@ -81,6 +84,7 @@ impl Plugin for GamePlugin {
             (
                 ((move_player, move_camera).chain(), zoom_camera)
                     .run_if(in_state(AppState::InGame)),
+                update_seed_display,
                 quit.run_if(input_pressed(KeyCode::KeyQ)),
             ),
         );
diff --git a/src/game/setup.rs b/src/game/setup.rs
index 0a2f15b..eb4585c 100644
--- a/src/game/setup.rs
+++ b/src/game/setup.rs
@@ -43,7 +43,7 @@ pub fn setup_from_seed(mut commands: Commands, seed: Res<Seed>) {
 }
 
 /// I mean, a camera is technically a user interface, I guess
-pub fn setup_ui(mut commands: Commands) {
+pub fn setup_camera(mut commands: Commands) {
     commands.spawn((Name::new("Camera"), Camera2d, IsDefaultUiCamera));
 }
 
diff --git a/src/game/ui.rs b/src/game/ui.rs
new file mode 100644
index 0000000..ad05109
--- /dev/null
+++ b/src/game/ui.rs
@@ -0,0 +1,31 @@
+use bevy::prelude::*;
+
+use super::seed::Seed;
+
+#[derive(Component, Debug)]
+pub struct SeedUI;
+
+pub fn setup_seed_display(mut commands: Commands) {
+    commands
+        .spawn((
+            Text::new("Seed: "),
+            Node {
+                position_type: PositionType::Absolute,
+                bottom: Val::Px(5.0),
+                left: Val::Px(5.0),
+                ..Default::default()
+            },
+        ))
+        .with_child((TextSpan::new("<N/A>"), SeedUI));
+}
+
+pub fn update_seed_display(seed: Option<Res<Seed>>, text: Query<&mut TextSpan, With<SeedUI>>) {
+    if let Some(value) = seed {
+        if value.is_changed() {
+            for mut span in text {
+                let number: u64 = (*value).into();
+                **span = format!("{}", number);
+            }
+        }
+    }
+}

From c29344ba6d04729b0e84c48a2f64557b2ca8b587 Mon Sep 17 00:00:00 2001
From: Michael Bradley <michaelmbrad@gmail.com>
Date: Sat, 5 Jul 2025 23:03:52 -0400
Subject: [PATCH 3/4] Add Peer UI display

---
 src/game/plugin.rs |  8 +++--
 src/game/ui.rs     | 77 ++++++++++++++++++++++++++++++++++++++++++++--
 src/net/mod.rs     |  2 +-
 3 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/src/game/plugin.rs b/src/game/plugin.rs
index 8929879..6943b7b 100644
--- a/src/game/plugin.rs
+++ b/src/game/plugin.rs
@@ -13,7 +13,7 @@ use super::{
         check_for_seed, setup_balls, setup_camera, setup_from_seed, setup_player, setup_walls,
     },
     state::AppState,
-    ui::{setup_seed_display, update_seed_display},
+    ui::{setup_peer_ui, setup_seed_ui, update_peer_ui, update_peer_ui_timings, update_seed_ui},
 };
 
 #[derive(Debug, Clone, Copy)]
@@ -59,7 +59,7 @@ impl Plugin for GamePlugin {
             PhysicsPlugins::default().with_length_unit(50.0),
         ))
         .init_state::<AppState>()
-        .add_systems(Startup, (setup_camera, setup_seed_display))
+        .add_systems(Startup, (setup_camera, setup_seed_ui, setup_peer_ui))
         .add_systems(
             OnEnter(AppState::InGame),
             (
@@ -84,7 +84,9 @@ impl Plugin for GamePlugin {
             (
                 ((move_player, move_camera).chain(), zoom_camera)
                     .run_if(in_state(AppState::InGame)),
-                update_seed_display,
+                update_seed_ui,
+                (update_peer_ui, update_peer_ui_timings)
+                    .run_if(in_state(NetworkState::MultiPlayer)),
                 quit.run_if(input_pressed(KeyCode::KeyQ)),
             ),
         );
diff --git a/src/game/ui.rs b/src/game/ui.rs
index ad05109..4abd6d1 100644
--- a/src/game/ui.rs
+++ b/src/game/ui.rs
@@ -1,11 +1,13 @@
 use bevy::prelude::*;
 
+use crate::net::prelude::{Peer, PeerReceiveTiming, PeerSendTiming};
+
 use super::seed::Seed;
 
 #[derive(Component, Debug)]
 pub struct SeedUI;
 
-pub fn setup_seed_display(mut commands: Commands) {
+pub fn setup_seed_ui(mut commands: Commands) {
     commands
         .spawn((
             Text::new("Seed: "),
@@ -13,13 +15,13 @@ pub fn setup_seed_display(mut commands: Commands) {
                 position_type: PositionType::Absolute,
                 bottom: Val::Px(5.0),
                 left: Val::Px(5.0),
-                ..Default::default()
+                ..default()
             },
         ))
         .with_child((TextSpan::new("<N/A>"), SeedUI));
 }
 
-pub fn update_seed_display(seed: Option<Res<Seed>>, text: Query<&mut TextSpan, With<SeedUI>>) {
+pub fn update_seed_ui(seed: Option<Res<Seed>>, text: Query<&mut TextSpan, With<SeedUI>>) {
     if let Some(value) = seed {
         if value.is_changed() {
             for mut span in text {
@@ -29,3 +31,72 @@ pub fn update_seed_display(seed: Option<Res<Seed>>, text: Query<&mut TextSpan, W
         }
     }
 }
+
+#[derive(Component, Debug)]
+pub struct PeerUI;
+
+pub fn setup_peer_ui(mut commands: Commands) {
+    commands
+        .spawn((
+            Node {
+                display: Display::Flex,
+                position_type: PositionType::Absolute,
+                top: Val::Px(5.0),
+                right: Val::Px(5.0),
+                row_gap: Val::Px(5.0),
+                flex_direction: FlexDirection::Column,
+                align_items: AlignItems::FlexEnd,
+                justify_content: JustifyContent::FlexStart,
+                ..default()
+            },
+            PeerUI,
+        ))
+        .with_children(|builder| {
+            builder.spawn(Text::new("Peer Recv Send"));
+        });
+}
+
+#[derive(Component)]
+pub struct PeerID(Entity);
+
+pub fn update_peer_ui(
+    ui: Query<(Entity, &Children), With<PeerUI>>,
+    rows: Query<&PeerID>,
+    added: Query<Entity, Added<Peer>>,
+    mut removed: RemovedComponents<Peer>,
+    mut commands: Commands,
+) {
+    for (table, children) in ui {
+        for addition in added {
+            commands
+                .entity(table)
+                .with_child((Text::new("---- ---- ----"), PeerID(addition)));
+        }
+        for removal in removed.read() {
+            for child in children {
+                if let Ok(id) = rows.get(*child) {
+                    if id.0 == removal {
+                        commands.entity(*child).despawn();
+                    }
+                }
+            }
+        }
+    }
+}
+
+pub fn update_peer_ui_timings(
+    rows: Query<(&mut Text, &PeerID)>,
+    peers: Query<(&Peer, &PeerReceiveTiming, &PeerSendTiming)>,
+    time: Res<Time>,
+) {
+    for (mut row, id) in rows {
+        if let Ok((peer, recv, send)) = peers.get(id.0) {
+            **row = format!(
+                "{} {:.2} {:.2}",
+                peer.uuid,
+                (time.elapsed() - recv.time().unwrap_or(default())).as_secs_f64(),
+                (time.elapsed() - send.time()).as_secs_f64()
+            )
+        }
+    }
+}
diff --git a/src/net/mod.rs b/src/net/mod.rs
index c310356..678172f 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -9,6 +9,6 @@ mod thread;
 #[allow(unused_imports)]
 pub mod prelude {
     pub use super::packet::{InboundPacket, OutboundPacket, Packet};
-    pub use super::peer::Peer;
+    pub use super::peer::{Peer, PeerReceiveTiming, PeerSendTiming};
     pub use super::plugin::{NetIOPlugin, NetworkState};
 }

From 9ab8db41de86d04448eed25250559fd2b1628809 Mon Sep 17 00:00:00 2001
From: Michael Bradley <michaelmbrad@gmail.com>
Date: Sat, 5 Jul 2025 23:04:46 -0400
Subject: [PATCH 4/4] Don't specify peer port

Using a port of 0 and letting the OS choose for us means that we can run multiple peers locally
---
 .vscode/launch.json | 4 ++--
 src/lib.rs          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 323b2e1..424d2c8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,7 @@
       "cargo": {
         "args": ["build"]
       },
-      "args": ["--seed=gargamel"],
+      "args": ["--seed=gargamel", "--port=25565"],
       "cwd": "${workspaceFolder}",
       "env": {
         "CARGO_MANIFEST_DIR": "${workspaceFolder}",
@@ -30,7 +30,7 @@
       "cargo": {
         "args": ["build"]
       },
-      "args": ["--port=25566", "--connect=[::1]:25565"],
+      "args": ["--connect=[::1]:25565"],
       "cwd": "${workspaceFolder}",
       "env": {
         "CARGO_MANIFEST_DIR": "${workspaceFolder}",
diff --git a/src/lib.rs b/src/lib.rs
index 3fad59d..0c637a8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,7 +20,7 @@ pub struct AppSettings {
     source: Source,
 
     /// The port the app should listen for connections on
-    #[arg(short, long, default_value = "25565")]
+    #[arg(short, long, default_value = "0")]
     port: u16,
 }