Legacy-proxy: Use whole startup phase as overhead time.

Author: Jupeyy

game/legacy-proxy/src/client.rs

@@ -1,4 +1,4 @@
-use std::{collections::BTreeMap, net::SocketAddr, time::Duration};
+use std::{collections::BTreeMap, net::SocketAddr};
 
 use anyhow::anyhow;
 use arrayvec::ArrayVec;
@@ -208,8 +208,6 @@ pub struct ClientData {
     pub latest_input: snap_obj::PlayerInput,
     pub latest_char_input: CharacterInput,
 
-    pub connect_time: Duration,
-
     pub player_info: NetworkCharacterInfo,
 
     pub latest_inputs: BTreeMap<i32, (CharacterInput, snap_obj::PlayerInput)>,
@@ -226,7 +224,6 @@ impl ProxyClient {
     pub fn new(
         player_info: NetworkCharacterInfo,
         socket: SocketClient,
-        connect_time: Duration,
         id: u64,
         secondary_player: bool,
     ) -> Self {
@@ -255,8 +252,6 @@ impl ProxyClient {
                     inp
                 },
 
-                connect_time,
-
                 player_info,
 
                 latest_inputs: Default::default(),

game/legacy-proxy/src/lib.rs

@@ -347,6 +347,8 @@ struct Client {
     log: ConnectingLog,
 
     last_snapshot: Snapshot,
+
+    start_time: Duration,
 }
 
 impl Client {
@@ -356,6 +358,7 @@ impl Client {
         addr: SocketAddr,
         log: ConnectingLog,
     ) -> anyhow::Result<LegacyProxy> {
+        let proxy_start = time.now();
         let fs = io.fs.clone();
 
         log.log("Preparing proxy socket");
@@ -675,6 +678,8 @@ impl Client {
                     is_finished: is_finished_thread,
 
                     log,
+
+                    start_time: proxy_start,
                 };
 
                 app.run_loop().unwrap();
@@ -3528,13 +3533,7 @@ impl Client {
 
                                 self.players.insert(
                                     self.base.id_generator.next_id(),
-                                    ProxyClient::new(
-                                        Default::default(),
-                                        sock_loop,
-                                        self.time.now(),
-                                        0,
-                                        false,
-                                    ),
+                                    ProxyClient::new(Default::default(), sock_loop, 0, false),
                                 );
                             }
                         }
@@ -3564,13 +3563,7 @@ impl Client {
 
                             self.players.insert(
                                 self.base.id_generator.next_id(),
-                                ProxyClient::new(
-                                    Default::default(),
-                                    sock_loop,
-                                    self.time.now(),
-                                    0,
-                                    false,
-                                ),
+                                ProxyClient::new(Default::default(), sock_loop, 0, false),
                             );
                         }
                         ClientToServerMessage::Ready(msg) => {
@@ -3619,13 +3612,7 @@ impl Client {
                                 let player_id = self.base.id_generator.next_id();
                                 self.players.insert(
                                     player_id,
-                                    ProxyClient::new(
-                                        ev.player_info,
-                                        sock_loop,
-                                        self.time.now(),
-                                        ev.id,
-                                        true,
-                                    ),
+                                    ProxyClient::new(ev.player_info, sock_loop, ev.id, true),
                                 );
                                 if let Some(con_id) = self.con_id {
                                     self.server_network.send_unordered_to(
@@ -4531,10 +4518,9 @@ impl Client {
                                 self.server_network.send_unordered_to(
                                     &ServerToClientMessage::ServerInfo {
                                         info: server_info,
-                                        overhead: self
-                                            .time
-                                            .now()
-                                            .saturating_sub(player.data.connect_time),
+                                        // the proxy is not really good at estimating the first ping
+                                        // so give it the whole startup time as overhead instead
+                                        overhead: self.time.now().saturating_sub(self.start_time),
                                     },
                                     &con_id,
                                 );