From f3e58fd3fa7b1d4ed1129b814cffb82600466eee Mon Sep 17 00:00:00 2001
From: n9k <originalcocaineninja@protonmail.com>
Date: Wed, 15 Jun 2022 20:50:43 +0000
Subject: [PATCH] Refactor info update background task

We now time the interval between consecutive tasks. This is more precise
than using the constant interval the task is supposed to run at since
there is some drift on each run (~0.004s).
---
 anonstream/__init__.py |  1 +
 anonstream/tasks.py    | 44 ++++++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/anonstream/__init__.py b/anonstream/__init__.py
index d2c609e..b853268 100644
--- a/anonstream/__init__.py
+++ b/anonstream/__init__.py
@@ -47,6 +47,7 @@ def create_app(config_file):
     app.stream_title = None
     app.stream_uptime = None
     app.stream_viewership = None
+    app.last_info_task = None
 
     # Background tasks' asyncio.sleep tasks, cancelled on shutdown
     app.background_sleep = set()
diff --git a/anonstream/tasks.py b/anonstream/tasks.py
index 73a714c..802bf40 100644
--- a/anonstream/tasks.py
+++ b/anonstream/tasks.py
@@ -130,56 +130,58 @@ async def t_broadcast_users_update(iteration):
         broadcast_users_update()
 
 @with_period(CONFIG['TASK_BROADCAST_STREAM_INFO_UPDATE'])
-async def t_broadcast_stream_info_update(iteration):
+@with_timestamp(precise=True)
+async def t_broadcast_stream_info_update(timestamp, iteration):
     if iteration == 0:
         title = await get_stream_title()
-        uptime, viewership = get_stream_uptime_and_viewership()
+        uptime, viewership = get_stream_uptime_and_viewership(rounded=False)
         current_app.stream_title = title
         current_app.stream_uptime = uptime
         current_app.stream_viewership = viewership
     else:
-        payload = {}
-
+        info = {}
         title = await get_stream_title()
-        uptime, viewership = get_stream_uptime_and_viewership()
+        uptime, viewership = get_stream_uptime_and_viewership(rounded=False)
 
         # Check if the stream title has changed
         if current_app.stream_title != title:
             current_app.stream_title = title
-            payload['title'] = title
+            info['title'] = title
 
         # Check if the stream uptime has changed unexpectedly
-        if current_app.stream_uptime is None:
-            expected_uptime = None
+        last_uptime, current_app.stream_uptime = (
+            current_app.stream_uptime, uptime
+        )
+        if last_uptime is None:
+            projected_uptime = None
         else:
-            expected_uptime = (
-                current_app.stream_uptime
-                + CONFIG['TASK_BROADCAST_STREAM_INFO_UPDATE']
-            )
-        current_app.stream_uptime = uptime
-        if uptime is None and expected_uptime is None:
+            last_info_task_ago = timestamp - current_app.last_info_task
+            projected_uptime = last_uptime + last_info_task_ago
+        if uptime is None and projected_uptime is None:
             stats_changed = False
-        elif uptime is None or expected_uptime is None:
+        elif uptime is None or projected_uptime is None:
             stats_changed = True
         else:
-            stats_changed = abs(uptime - expected_uptime) >= 0.5
+            stats_changed = abs(uptime - projected_uptime) >= 0.5
 
         # Check if viewership has changed
         if current_app.stream_viewership != viewership:
             current_app.stream_viewership = viewership
             stats_changed = True
 
+        # Broadcast iff anything has changed
         if stats_changed:
             if uptime is None:
-                payload['stats'] = None
+                info['stats'] = None
             else:
-                payload['stats'] = {
-                    'uptime': uptime,
+                info['stats'] = {
+                    'uptime': round(uptime, 2),
                     'viewership': viewership,
                 }
+        if info:
+            broadcast(USERS, payload={'type': 'info', **info})
 
-        if payload:
-            broadcast(USERS, payload={'type': 'info', **payload})
+    current_app.last_info_task = timestamp
 
 current_app.add_background_task(t_delete_eyes)
 current_app.add_background_task(t_sunset_users)