Code Updates & SeveralFixes

FileStream/server/__init__.py

@@ -10,30 +10,24 @@ from FileStream.bot import MULTI_CLIENTS, WORK_LOADS, ACTIVE_CLIENTS
 
 
 # Set time to consider a client inactive (e.g., 10 minutes)
-INACTIVITY_TIMEOUT = 240  # 4 minutes
+INACTIVITY_TIMEOUT = 180  # 3 minutes
 
 async def clear_inactive_clients():
     """Clear inactive clients from ACTIVE_CLIENTS."""
-    while True:
-        await asyncio.sleep(INACTIVITY_TIMEOUT)  # Check every INACTIVITY_TIMEOUT seconds
-
-        now = asyncio.get_event_loop().time()  # Get current time
-        
-        inactive_clients = [
-            client_id for client_id, tg_connect in ACTIVE_CLIENTS.items()
-            if now - tg_connect.last_activity > INACTIVITY_TIMEOUT  # Compare with last_activity timestamp
-        ]
-
-        for client in inactive_clients:
-            # Log and clear the inactive client
-            logging.info(f"Clearing inactive client: {client}")
-            del ACTIVE_CLIENTS[client]  # Remove inactive client from ACTIVE_CLIENTS
+    await asyncio.sleep(INACTIVITY_TIMEOUT)  # Check every INACTIVITY_TIMEOUT seconds
+    now = asyncio.get_event_loop().time()  # Get current time 
+    inactive_clients = [
+        client_id for client_id, tg_connect in ACTIVE_CLIENTS.items()
+        if now - tg_connect.last_activity > INACTIVITY_TIMEOUT  # Compare with last_activity timestamp
+    ]
+    for client in inactive_clients:
+        # Log and clear the inactive client
+        logging.info(f"** Clearing inactive client: {client.name}")
+        del ACTIVE_CLIENTS[client]  # Remove inactive client from ACTIVE_CLIENTS
 
 
 async def root_route_handler(request):
-    client_id = request.remote  # You can use the client's IP or any identifier
-    ACTIVE_CLIENTS[client_id] = asyncio.get_event_loop().time()  # Update last activity time
-    return web.json_response({"status": "alive", "message": "Server is running"})
+    return web.json_response({"status": "alive", "message": "Server is running","active_clients":ACTIVE_CLIENTS,"public_ip":request.remote})
 
 
 def web_server():

FileStream/utils/FileProcessors/custom_dl.py

@@ -214,6 +214,8 @@ class ByteStreamer:
                         raw.functions.upload.GetFile(location=location, offset=offset, limit=chunk_size), )
         except (TimeoutError, AttributeError):
             pass
+        except Exception as e:
+            logging.info(f"Error at Bytestreamer Generating Chunk : {e}")
         finally:
             logging.debug(f"Finished yielding file with {current_part} parts.")
             WORK_LOADS[index] -= 1  # Decrease the workload for this client
@@ -223,17 +225,8 @@ class ByteStreamer:
         Function to clean the cache to reduce memory usage.
         This method will be called periodically to clear the cached file properties.
         """
-        while True:
-            await asyncio.sleep(self.clean_timer)  # Wait for the cleanup interval
-            logging.debug("*** Cleaning cached file properties...")
-            self.cached_file_ids.clear()  # Clear the cache
-            logging.debug("Cache cleaned.")
+        await asyncio.sleep(self.clean_timer)  # Wait for the cleanup interval
+        logging.info("*** Cleaning cached file IDs...")
+        self.cached_file_ids.clear()  # Clear the cache
+        logging.debug("Cache cleaned.")
 
-    @staticmethod
-    def is_active(last_activity: float, timeout: float = 120) -> bool:
-        """
-        Determines if the client is active based on the last activity time.
-        If the client has been inactive for longer than the timeout period (default 30 minutes),
-        they are considered inactive.
-        """
-        return (asyncio.get_event_loop().time() - last_activity) < timeout