feat: re-add gateway.latency prop

Author: LordOfPolls

interactions/api/gateway/gateway.py

@@ -132,14 +132,6 @@ async def __aexit__(
                 finally:
                     self.ws = None
 
-    @property
-    def average_latency(self) -> float:
-        """Get the average latency of the connection."""
-        if self.latency:
-            return sum(self.latency) / len(self.latency)
-        else:
-            return float("inf")
-
     async def run(self) -> None:
         """Start receiving events from the websocket."""
         while True:
@@ -184,14 +176,14 @@ async def dispatch_opcode(self, data, op: OPCODE) -> None:
                 return await self.send_heartbeat()
 
             case OPCODE.HEARTBEAT_ACK:
-                self.latency.append(time.perf_counter() - self._last_heartbeat)
+                self._latency.append(time.perf_counter() - self._last_heartbeat)
 
-                if self._last_heartbeat != 0 and self.latency[-1] >= 15:
+                if self._last_heartbeat != 0 and self._latency[-1] >= 15:
                     self.logger.warning(
-                        f"High Latency! shard ID {self.shard[0]} heartbeat took {self.latency[-1]:.1f}s to be acknowledged!"
+                        f"High Latency! shard ID {self.shard[0]} heartbeat took {self._latency[-1]:.1f}s to be acknowledged!"
                     )
                 else:
-                    self.logger.debug(f"❤ Heartbeat acknowledged after {self.latency[-1]:.5f} seconds")
+                    self.logger.debug(f"❤ Heartbeat acknowledged after {self._latency[-1]:.5f} seconds")
 
                 return self._acknowledged.set()
 

interactions/api/gateway/websocket.py

@@ -47,7 +47,7 @@ def __init__(self, state: "ConnectionState") -> None:
         self.rl_manager = WebsocketRateLimit()
 
         self.heartbeat_interval = None
-        self.latency = collections.deque(maxlen=10)
+        self._latency = collections.deque(maxlen=10)
 
         # This lock needs to be held to send something over the gateway, but is also held when
         # reconnecting. That way there's no race conditions between sending and reconnecting.
@@ -116,11 +116,16 @@ async def __aexit__(
     @property
     def average_latency(self) -> float:
         """Get the average latency of the connection."""
-        if self.latency:
-            return sum(self.latency) / len(self.latency)
+        if self._latency:
+            return sum(self._latency) / len(self._latency)
         else:
             return float("inf")
 
+    @property
+    def latency(self) -> float:
+        """Get the latency of the connection."""
+        return self._latency[-1]
+
     @property
     def loop(self) -> asyncio.AbstractEventLoop:
         return asyncio.get_running_loop()

interactions/api/voice/voice_gateway.py

@@ -165,14 +165,14 @@ async def receive(self, force=False) -> str:
     async def dispatch_opcode(self, data, op) -> None:
         match op:
             case OP.HEARTBEAT_ACK:
-                self.latency.append(time.perf_counter() - self._last_heartbeat)
+                self._latency.append(time.perf_counter() - self._last_heartbeat)
 
-                if self._last_heartbeat != 0 and self.latency[-1] >= 15:
+                if self._last_heartbeat != 0 and self._latency[-1] >= 15:
                     self.logger.warning(
-                        f"High Latency! Voice heartbeat took {self.latency[-1]:.1f}s to be acknowledged!"
+                        f"High Latency! Voice heartbeat took {self._latency[-1]:.1f}s to be acknowledged!"
                     )
                 else:
-                    self.logger.debug(f"❤ Heartbeat acknowledged after {self.latency[-1]:.5f} seconds")
+                    self.logger.debug(f"❤ Heartbeat acknowledged after {self._latency[-1]:.5f} seconds")
 
                 return self._acknowledged.set()