Testing Changes

FileStream/server/Functions/downloader.py

@@ -22,22 +22,23 @@ from FileStream.utils.FileProcessors.custom_ul import  TeleUploader
 async def media_streamer(request: web.Request, db_id: str, speed: str):
     # Get the Range header from the request, default to 0 if not present
     range_header = request.headers.get("Range", 0)
-
-    index = min(WORK_LOADS, key=WORK_LOADS.get)
-    faster_client = MULTI_CLIENTS[index]
+    client = await req_client()
     # Log client info if multi-client mode
+    if Telegram.MULTI_CLIENT:
+        logging.info(f"Client {client['index']} is now serving {request.headers.get('X-FORWARDED-FOR', request.remote)}")
 
+    # Use an existing ByteStreamer or create a new one
+    tg_connect = ACTIVE_CLIENTS.get(client['client'], None)
     
-    if Telegram.MULTI_CLIENT:
-        logging.info(f"Client {index} is now serving {request.headers.get('X-FORWARDED-FOR', request.remote)}")
+    if tg_connect is None:
+        logging.debug(f"Creating new ByteStreamer object for client {client['index']}")
+        tg_connect = utils.ByteStreamer(client['client'])
+        ACTIVE_CLIENTS[client['client']] = tg_connect
 
-    if faster_client in ACTIVE_CLIENTS:
-        tg_connect = ACTIVE_CLIENTS[faster_client]
-        logging.debug(f"Using cached ByteStreamer object for client {index}")
     else:
-        logging.debug(f"Creating new ByteStreamer object forclient {index}")
-        tg_connect = utils.ByteStreamer(faster_client)
-        ACTIVE_CLIENTS[faster_client] = tg_connect
+        tg_connect.update_last_activity()
+        logging.debug(f"Using cached ByteStreamer object for client {client['index']}")
+
     try:
         # Fetch file properties once and use it throughout
         logging.debug("Fetching file properties")
@@ -67,7 +68,7 @@ async def media_streamer(request: web.Request, db_id: str, speed: str):
 
         # Request the file chunks
         body = tg_connect.yield_file(
-            file_id, index, offset, first_part_cut, last_part_cut, part_count, chunk_size
+            file_id, client['index'], offset, first_part_cut, last_part_cut, part_count, chunk_size
         )
 
         # Determine MIME type and filename
@@ -107,7 +108,6 @@ def parse_range(range_header: str, file_size: int):
             #from_bytes = request.http_range.start or 0
             #until_bytes = (request.http_range.stop or file_size) - 1
         return from_bytes, until_bytes
-
     except ValueError:
         return None, None
 

FileStream/server/Functions/{downloader copy.py → downloader_copy.py}

@@ -22,23 +22,22 @@ from FileStream.utils.FileProcessors.custom_ul import  TeleUploader
 async def media_streamer(request: web.Request, db_id: str, speed: str):
     # Get the Range header from the request, default to 0 if not present
     range_header = request.headers.get("Range", 0)
-    client = await req_client()
+
+    index = min(WORK_LOADS, key=WORK_LOADS.get)
+    faster_client = MULTI_CLIENTS[index]
     # Log client info if multi-client mode
-    if Telegram.MULTI_CLIENT:
-        logging.info(f"Client {client['index']} is now serving {request.headers.get('X-FORWARDED-FOR', request.remote)}")
 
-    # Use an existing ByteStreamer or create a new one
-    tg_connect = ACTIVE_CLIENTS.get(client['client'], None)
     
-    if tg_connect is None:
-        logging.debug(f"Creating new ByteStreamer object for client {client['index']}")
-        tg_connect = utils.ByteStreamer(client['client'])
-        ACTIVE_CLIENTS[client['client']] = tg_connect
+    if Telegram.MULTI_CLIENT:
+        logging.info(f"Client {index} is now serving {request.headers.get('X-FORWARDED-FOR', request.remote)}")
 
+    if faster_client in ACTIVE_CLIENTS:
+        tg_connect = ACTIVE_CLIENTS[faster_client]
+        logging.debug(f"Using cached ByteStreamer object for client {index}")
     else:
-        tg_connect.update_last_activity()
-        logging.debug(f"Using cached ByteStreamer object for client {client['index']}")
-
+        logging.debug(f"Creating new ByteStreamer object forclient {index}")
+        tg_connect = utils.ByteStreamer(faster_client)
+        ACTIVE_CLIENTS[faster_client] = tg_connect
     try:
         # Fetch file properties once and use it throughout
         logging.debug("Fetching file properties")
@@ -68,7 +67,7 @@ async def media_streamer(request: web.Request, db_id: str, speed: str):
 
         # Request the file chunks
         body = tg_connect.yield_file(
-            file_id, client['index'], offset, first_part_cut, last_part_cut, part_count, chunk_size
+            file_id, index, offset, first_part_cut, last_part_cut, part_count, chunk_size
         )
 
         # Determine MIME type and filename
@@ -108,6 +107,7 @@ def parse_range(range_header: str, file_size: int):
             #from_bytes = request.http_range.start or 0
             #until_bytes = (request.http_range.stop or file_size) - 1
         return from_bytes, until_bytes
+
     except ValueError:
         return None, None
 

FileStream/utils/FileProcessors/custom_dl.py

@@ -5,7 +5,7 @@ import asyncio
 import logging
 import traceback
 from aiohttp import web
-from typing import Dict, Union
+from typing import Dict, Union,Optional
 from pyrogram.types import Message
 from pyrogram import Client, utils, raw
 from pyrogram.session import Session, Auth
@@ -29,7 +29,7 @@ class ByteStreamer:
         self.clean_timer = 30 * 60  # Cache cleanup timer set to 30 minutes
         self.client: Client = client
         self.cached_file_ids: Dict[str, FileId] = {}  # Cache to store file properties by db_id
-        self.last_activity: float = asyncio.get_event_loop().time()  # Track last activity time for the client
+        self.last_activity: float = Optional[float]  # Track last activity time for the client
         asyncio.create_task(self.clean_cache())  # Start the cache cleanup task
 
     def update_last_activity(self):