Code Updates & Optimisations, Inactivity Recreation

FileStream/__main__.py

@@ -6,13 +6,13 @@ from aiohttp import web
 from pyrogram import idle
 import logging.handlers as handlers
 
-#------------------Local Imports----------------------#
+# ------------------Local Imports----------------------#
 
 from FileStream.bot import FileStream
-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
+from FileStream.server import web_server, clear_inactive_clients
 
 # Configure logging
 logging.basicConfig(
@@ -29,8 +29,6 @@ logging.getLogger("aiohttp").setLevel(logging.ERROR)
 logging.getLogger("pyrogram").setLevel(logging.ERROR)
 logging.getLogger("aiohttp.web").setLevel(logging.ERROR)
 
-server = web.AppRunner(web_server())
-
 async def start_services():
     print(
         "****\n"
@@ -47,17 +45,21 @@ async def start_services():
     FileStream.id = bot_info.id
     FileStream.username = bot_info.username
     FileStream.fname = bot_info.first_name
-    print("------------------------------ DONE ------------------------------\n\n")
+    print("------------------------------ DONE ------------------------------\n")
 
     print("---------------------- Initializing Clients ----------------------")
     await initialize_clients()
     print("------------------------------ DONE ------------------------------\n\n")
 
     print("--------------------- Initializing Web Server ---------------------")
-    await server.setup()
+    server = web.AppRunner(web_server())  # Initialize the app runner
+    await server.setup()  # Setup the web server
     await web.TCPSite(server, Server.BIND_ADDRESS, Server.PORT).start()
     print("------------------------------ DONE ------------------------------\n\n")
 
+    # Start the background task to clear inactive clients after web server setup
+    asyncio.create_task(clear_inactive_clients())  # Now this works as event loop is running
+
     print(
         f"------------------------- Service Started -------------------------\n"
         f"Bot =>> {bot_info.first_name}\n" +
@@ -66,13 +68,7 @@ async def start_services():
         "------------------------------------------------------------------"
     )
 
-    # Uncomment the following section to send messages to specific sources
-    """
-    all_sources = [Telegram.ULOG_GROUP, Telegram.FLOG_CHANNEL, Telegram.PFLOG_CHANNEL]
-    for source in all_sources:
-        await FileStream.send_message(chat_id=source, text=f"Hi, I am Online @{Time_ISTKolNow()}", disable_web_page_preview=True)
-    """
-    await idle()
+    await idle()  # Keep the bot alive
 
 async def cleanup():
     await server.cleanup()
@@ -81,7 +77,8 @@ async def cleanup():
 
 if __name__ == "__main__":
     try:
-        loop.run_until_complete(start_services())
+        loop = asyncio.get_event_loop()  # Ensure the event loop is retrieved correctly
+        loop.run_until_complete(start_services())  # Run the services asynchronously
     except KeyboardInterrupt:
         print("\n------------------ Stopping Services KeyBoard Interrupt -----------------")
     except Exception as err:

FileStream/server/__init__.py

@@ -17,7 +17,7 @@ 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
+        await asyncio.sleep(INACTIVITY_TIMEOUT)  # Check every 10 minutes
 
         # Find clients that are inactive and clear them
         now = asyncio.get_event_loop().time()
@@ -44,6 +44,5 @@ def web_server():
     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 the app to be used with AppRunner
     return web_app