Code Updates & Optimisations Clearing UP ACTIVE_CLIENTS

FileStream/__main__.py

@@ -2,14 +2,16 @@ import sys
 import asyncio
 import logging
 import traceback
-import logging.handlers as handlers
-from FileStream.config import Telegram, Server
 from aiohttp import web
 from pyrogram import idle
+import logging.handlers as handlers
+
+#------------------Local Imports----------------------#
 
 from FileStream.bot import FileStream
-from FileStream.Tools import Time_ISTKolNow
 from FileStream.server import web_server
+from FileStream.Tools import Time_ISTKolNow
+from FileStream.config import Telegram, Server
 from FileStream.bot.clients import initialize_clients
 
 # Configure logging
@@ -39,6 +41,7 @@ async def start_services():
         )
         + "\n****\n-------------------- Initializing Telegram Bot --------------------"
     )
+
     await FileStream.start()
     bot_info = await FileStream.get_me()
     FileStream.id = bot_info.id
@@ -57,9 +60,9 @@ async def start_services():
 
     print(
         f"------------------------- Service Started -------------------------\n"
-        f"Bot =>> {bot_info.first_name}\n"
-        + (f"DC ID =>> {bot_info.dc_id}\n" if bot_info.dc_id else "")
-        + f"URL =>> {Server.URL}\n"
+        f"Bot =>> {bot_info.first_name}\n" +
+        (f"DC ID =>> {bot_info.dc_id}\n" if bot_info.dc_id else "") +
+        f"URL =>> {Server.URL}\n"
         "------------------------------------------------------------------"
     )
 
@@ -73,16 +76,17 @@ async def start_services():
 
 async def cleanup():
     await server.cleanup()
+    await FileStream.stop()
+
 
-async def main():
+if __name__ == "__main__":
     try:
-        await start_services()
+        loop.run_until_complete(start_services())
     except KeyboardInterrupt:
-        print("\n------------------------ Stopped Services ------------------------")
+        print("\n------------------ Stopping Services KeyBoard Interrupt -----------------")
     except Exception as err:
-        logging.error("An error occurred:\n%s", traceback.format_exc())
+        logging.error(traceback.format_exc())
     finally:
-        await cleanup()
-
-if __name__ == "__main__":
-    asyncio.run(main())
+        loop.run_until_complete(cleanup())
+        loop.stop()
+        print("------------------------ Stopped Services ------------------------")

FileStream/server/__init__.py

@@ -1,21 +1,46 @@
+import asyncio
+import logging
 from aiohttp import web
-#import aiohttp_cors
-from .routes_main import routes
-from .routes_api import api
-from .routes_app import sub_app
+
+#-----------------------Local Imports-------------------------#
+from FileStream.bot import MULTI_CLIENTS, WORK_LOADS, ACTIVE_CLIENTS
+
+
+# Set time to consider a client inactive (e.g., 10 minutes)
+INACTIVITY_TIMEOUT = 600  # 10 minutes
+
+async def clear_inactive_clients():
+    """
+    Periodically checks and clears inactive clients from ACTIVE_CLIENTS.
+    """
+    while True:
+        await asyncio.sleep(INACTIVITY_TIMEOUT)  # Check every 5 minutes
+
+        # Find clients that are inactive and clear them
+        now = asyncio.get_event_loop().time()
+        inactive_clients = [
+            client for client, last_activity in ACTIVE_CLIENTS.items() 
+            if now - last_activity > INACTIVITY_TIMEOUT
+        ]
+
+        for client in inactive_clients:
+            # Log and clear the inactive client
+            logging.info(f"Clearing inactive client: {client}")
+            del ACTIVE_CLIENTS[client]  # Clear the client
 
 
 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"})
 
 
-
 def web_server():
     web_app = web.Application(client_max_size=500)
     web_app.router.add_get('/', root_route_handler)
     web_app.add_routes(routes)
     web_app.add_subapp('/app', sub_app)
     web_app.add_subapp('/api', api)
+    # Start the background task to clear inactive clients
+    asyncio.create_task(clear_inactive_clients())
     return web_app
-
-

FileStream/server/routes_api.py

@@ -12,12 +12,14 @@ from aiohttp.http_exceptions import BadStatusLine
 
 #---------------------Local Imports----------------------------------#
 from FileStream.bot import req_client
-from FileStream.config import Telegram, Server
 from FileStream.Database import Database
-from FileStream.TMDB.Endpoint import search_tmdb_any, search_tmdb_tv, search_tmdb_movies
+from FileStream.config import Telegram, Server
+from .Functions.downloader import media_streamer
 from FileStream.server.exceptions import FIleNotFound, InvalidHash
+from FileStream.TMDB.Endpoint import search_tmdb_any, search_tmdb_tv, search_tmdb_movies
+
+
 
-from .Functions.downloader import media_streamer
 
 CORS_HEADERS = {
     "Access-Control-Allow-Origin": "*",
@@ -163,6 +165,7 @@ cors = aiohttp_cors.setup(api, defaults={"*": aiohttp_cors.ResourceOptions(
 )})
 
 cors.add(api.router.add_get('/', handle_v2))
+
 api.router.add_get('/files', list_all_files_db)
 api.router.add_get('/files/mix', list_all_files)
 api.router.add_get('/tmdb/mix', list_all_files_tmdb)

Unused Codes/__init__old.py

@@ -0,0 +1,69 @@
+#FileStream/server/__init__
+
+from aiohttp import web
+#import aiohttp_cors
+from .routes_main import routes
+from .routes_api import api
+from .routes_app import sub_app
+
+
+async def root_route_handler(request):
+    return web.json_response({"status": "alive", "message": "Server is running"})
+
+
+
+def web_server():
+    web_app = web.Application(client_max_size=500)
+    web_app.router.add_get('/', root_route_handler)
+    web_app.add_routes(routes)
+    web_app.add_subapp('/app', sub_app)
+    web_app.add_subapp('/api', api)
+    return web_app
+
+import asyncio
+import logging
+from aiohttp import web
+
+# Dictionary to store active clients, using client identifier (could be IP or session ID)
+ACTIVE_CLIENTS = {}
+
+# Set time to consider a client inactive (e.g., 5 minutes)
+INACTIVITY_TIMEOUT = 300  # 5 minutes
+
+async def clear_inactive_clients():
+    """
+    Periodically checks and clears inactive clients from ACTIVE_CLIENTS.
+    """
+    while True:
+        await asyncio.sleep(INACTIVITY_TIMEOUT)  # Check every 5 minutes
+
+        # Find clients that are inactive and clear them
+        now = asyncio.get_event_loop().time()
+        inactive_clients = [
+            client for client, last_activity in ACTIVE_CLIENTS.items() 
+            if now - last_activity > INACTIVITY_TIMEOUT
+        ]
+
+        for client in inactive_clients:
+            # Log and clear the inactive client
+            logging.info(f"Clearing inactive client: {client}")
+            del ACTIVE_CLIENTS[client]  # Clear the client
+
+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"})
+
+def web_server():
+    web_app = web.Application(client_max_size=500)
+    web_app.router.add_get('/', root_route_handler)
+    web_app.add_routes(routes)
+    web_app.add_subapp('/app', sub_app)
+    web_app.add_subapp('/api', api)
+    
+    # Start the background task to clear inactive clients
+    asyncio.create_task(clear_inactive_clients())
+    
+    return web_app
+