From 2b42838bfece54e1ef3fabb8fe72815698d2e6d7 Mon Sep 17 00:00:00 2001
From: SergeantPanda <chester.cullen@gmail.com>
Date: Mon, 24 Mar 2025 17:08:17 -0500
Subject: [PATCH] Added current bitrate for client and renamed
 transfer_rate_KBps to avg_rate_KBps for clarity.

---
 apps/proxy/ts_proxy/stream_generator.py | 66 ++++++++++++-------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/apps/proxy/ts_proxy/stream_generator.py b/apps/proxy/ts_proxy/stream_generator.py
index 412f4194..dc6c2fc2 100644
--- a/apps/proxy/ts_proxy/stream_generator.py
+++ b/apps/proxy/ts_proxy/stream_generator.py
@@ -271,43 +271,43 @@ class StreamGenerator:
                 self.bytes_sent += len(chunk)
                 self.chunks_sent += 1
                 logger.debug(f"[{self.client_id}] Sent chunk {self.chunks_sent} ({len(chunk)} bytes) to client")
-                # Log every 10 chunks and store in redis for visibility
+
+                current_time = time.time()
+
+                # Calculate average rate (since stream start)
+                elapsed_total = current_time - self.stream_start_time
+                avg_rate = self.bytes_sent / elapsed_total / 1024 if elapsed_total > 0 else 0
+
+                # Calculate current rate (since last measurement)
+                elapsed_current = current_time - self.last_stats_time
+                bytes_since_last = self.bytes_sent - self.last_stats_bytes
+
+                if elapsed_current > 0:
+                    self.current_rate = bytes_since_last / elapsed_current / 1024
+
+                # Update last stats values
+                self.last_stats_time = current_time
+                self.last_stats_bytes = self.bytes_sent
+                # Log every 10 chunks
                 if self.chunks_sent % 10 == 0:
-                    current_time = time.time()
-
-                    # Calculate average rate (since stream start)
-                    elapsed_total = current_time - self.stream_start_time
-                    avg_rate = self.bytes_sent / elapsed_total / 1024 if elapsed_total > 0 else 0
-
-                    # Calculate current rate (since last measurement)
-                    elapsed_current = current_time - self.last_stats_time
-                    bytes_since_last = self.bytes_sent - self.last_stats_bytes
-
-                    if elapsed_current > 0:
-                        self.current_rate = bytes_since_last / elapsed_current / 1024
-
-                    # Update last stats values
-                    self.last_stats_time = current_time
-                    self.last_stats_bytes = self.bytes_sent
-
                     logger.debug(f"[{self.client_id}] Stats: {self.chunks_sent} chunks, {self.bytes_sent/1024:.1f} KB, "
                                 f"avg: {avg_rate:.1f} KB/s, current: {self.current_rate:.1f} KB/s")
 
-                    # Store stats in Redis client metadata
-                    if proxy_server.redis_client:
-                        try:
-                            client_key = RedisKeys.client_metadata(self.channel_id, self.client_id)
-                            stats = {
-                                "chunks_sent": str(self.chunks_sent),
-                                "bytes_sent": str(self.bytes_sent),
-                                "avg_rate_KBps": str(round(avg_rate, 1)),
-                                "current_rate_KBps": str(round(self.current_rate, 1)),
-                                "stats_updated_at": str(current_time)
-                            }
-                            proxy_server.redis_client.hset(client_key, mapping=stats)
-                            # No need to set expiration as client heartbeat will refresh this key
-                        except Exception as e:
-                            logger.warning(f"[{self.client_id}] Failed to store stats in Redis: {e}")
+                # Store stats in Redis client metadata
+                if proxy_server.redis_client:
+                    try:
+                        client_key = RedisKeys.client_metadata(self.channel_id, self.client_id)
+                        stats = {
+                            "chunks_sent": str(self.chunks_sent),
+                            "bytes_sent": str(self.bytes_sent),
+                            "avg_rate_KBps": str(round(avg_rate, 1)),
+                            "current_rate_KBps": str(round(self.current_rate, 1)),
+                            "stats_updated_at": str(current_time)
+                        }
+                        proxy_server.redis_client.hset(client_key, mapping=stats)
+                        # No need to set expiration as client heartbeat will refresh this key
+                    except Exception as e:
+                        logger.warning(f"[{self.client_id}] Failed to store stats in Redis: {e}")
 
             except Exception as e:
                 logger.error(f"[{self.client_id}] Error sending chunk to client: {e}")