Code Updates & Optimisations :Server Upgrade Test

FileStream/server/API/__init__.py

@@ -0,0 +1,38 @@
+import aiohttp_cors
+from aiohttp import web
+
+
+from .listings import (
+    list_all_files_db,
+    list_all_files,
+    list_all_files_tmdb,
+    list_10_all_files_db,
+    list_all_tmdb_tv_from_db,
+    list_all_tmdb_movies_from_db,
+)
+from .downloads import stream_handler
+from .uploads import upload_file
+
+async def handle_v2(request):
+    return web.Response(text="Hello from app api!")
+
+# Web server setup with optimized CORS handling
+api = web.Application()
+cors = aiohttp_cors.setup(api, defaults={"*": aiohttp_cors.ResourceOptions(
+    allow_credentials=False,
+    expose_headers="*",
+    allow_headers="*",
+    allow_methods="*"
+)})
+
+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)
+api.router.add_get('/10/files', list_10_all_files_db)
+api.router.add_get('/tmdb/tv', list_all_tmdb_tv_from_db)
+api.router.add_get('/tmdb/movies', list_all_tmdb_movies_from_db)
+
+api.router.add_get('/upload', upload_file)
+api.router.add_get('/dl/{path}', stream_handler)

FileStream/server/API/downloads.py

@@ -0,0 +1,37 @@
+
+import os
+import json
+import logging
+import asyncio
+import traceback
+import aiohttp_cors
+from aiohttp import web
+from pyrogram import raw
+from bson import ObjectId
+from bson.json_util import dumps
+from aiohttp.http_exceptions import BadStatusLine
+
+#---------------------Local Imports----------------------------------#
+from FileStream.bot import req_client
+from ..Functions import media_streamer
+from FileStream.Database import Database
+from FileStream.config import Telegram, Server
+from FileStream.server.Exceptions import FIleNotFound, InvalidHash
+from FileStream.TMDB.Endpoint import search_tmdb_any, search_tmdb_tv, search_tmdb_movies
+
+
+# Stream file handler with optimized error handling
+async def stream_handler(request: web.Request):
+    try:
+        path = request.match_info["path"]
+        return await media_streamer(request, path, "FAST")
+    except InvalidHash as e:
+        raise web.HTTPForbidden(text=e.message)
+    except FIleNotFound as e:
+        raise web.HTTPNotFound(text=e.message)
+    except (AttributeError, BadStatusLine, ConnectionResetError):
+        pass  # Handle expected errors silently
+    except Exception as e:
+        logging.error(f"Error while streaming file: {str(e)}")
+        traceback.print_exc()
+        raise web.HTTPInternalServerError(text=str(e))

FileStream/server/{routes_api.py → API/listings.py}

@@ -12,10 +12,10 @@ from aiohttp.http_exceptions import BadStatusLine
 
 #---------------------Local Imports----------------------------------#
 from FileStream.bot import req_client
+from ..Functions import media_streamer
 from FileStream.Database import Database
 from FileStream.config import Telegram, Server
-from .Functions.downloader import media_streamer
-from FileStream.server.exceptions import FIleNotFound, InvalidHash
+from FileStream.server.Exceptions import FIleNotFound, InvalidHash
 from FileStream.TMDB.Endpoint import search_tmdb_any, search_tmdb_tv, search_tmdb_movies
 
 
@@ -26,8 +26,7 @@ CORS_HEADERS = {
     "Access-Control-Allow-Headers": "*"
 }
 
-async def handle_v2(request):
-    return web.Response(text="Hello from app api!")
+
 
 # API endpoint to list 10 files (pagination optimization)
 async def list_10_all_files_db(request):
@@ -107,71 +106,8 @@ async def list_all_files(request):
     } for row in files]
     return web.json_response(json.loads(dumps(resp)), headers=CORS_HEADERS)
 
-# Upload endpoint with optimization (not reading entire file into memory)
-async def upload_file(request: web.Request):
-    data = await request.post()
-    file = data.get('file').file
-    chunk = file.read()  # Read the file in chunks to avoid memory overload
-    file_details = dict(
-        user_id="thebinary1",
-        dropzone_id=str(data["dzuuid"]),
-        file=dict(
-            file_id=str(data["dzuuid"]),
-            file_unique_id=str(data["dzuuid"]),
-            file_name=str(data.get('file').filename),
-            file_size=int(data["dztotalfilesize"]),
-            mime_type=mime_identifier(str(data.get('file').filename)),
-            part_size=int(data["dzchunksize"]),
-            file_part=int(data["dzchunkindex"]),
-            total_parts=int(data["dztotalchunkcount"])
-        ),
-        time=Time_ISTKolNow(),
-        user_type="WEB",
-        privacy_type="PRIVATE"
-    )
-    
-    client_req = await req_client()  # Ensure client request is fast and optimized
-    tg_connect = TeleUploader(client_req["client"])
-    main = await tg_connect.upload_web_file(file_details, chunk)
-    
-    return web.json_response({
-        "status": main.get("status"),
-        "message": main.get("message")
-    })
-
-# Stream file handler with optimized error handling
-async def stream_handler(request: web.Request):
-    try:
-        path = request.match_info["path"]
-        return await media_streamer(request, path, "FAST")
-    except InvalidHash as e:
-        raise web.HTTPForbidden(text=e.message)
-    except FIleNotFound as e:
-        raise web.HTTPNotFound(text=e.message)
-    except (AttributeError, BadStatusLine, ConnectionResetError):
-        pass  # Handle expected errors silently
-    except Exception as e:
-        logging.error(f"Error while streaming file: {str(e)}")
-        traceback.print_exc()
-        raise web.HTTPInternalServerError(text=str(e))
-
-# Web server setup with optimized CORS handling
-api = web.Application()
-cors = aiohttp_cors.setup(api, defaults={"*": aiohttp_cors.ResourceOptions(
-    allow_credentials=False,
-    expose_headers="*",
-    allow_headers="*",
-    allow_methods="*"
-)})
-
-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)
-api.router.add_get('/10/files', list_10_all_files_db)
-api.router.add_get('/tmdb/tv', list_all_tmdb_tv_from_db)
-api.router.add_get('/tmdb/movies', list_all_tmdb_movies_from_db)
-
-api.router.add_get('/upload', upload_file)
-api.router.add_get('/dl/{path}', stream_handler)
+
+
+
+
+

FileStream/server/API/uploads.py

@@ -0,0 +1,52 @@
+
+import os
+import json
+import logging
+import asyncio
+import traceback
+import aiohttp_cors
+from aiohttp import web
+from pyrogram import raw
+from bson import ObjectId
+from bson.json_util import dumps
+from aiohttp.http_exceptions import BadStatusLine
+
+#---------------------Local Imports----------------------------------#
+from FileStream.bot import req_client
+from ..Functions import media_streamer
+from FileStream.Database import Database
+from FileStream.config import Telegram, Server
+from FileStream.server.Exceptions import FIleNotFound, InvalidHash
+from FileStream.TMDB.Endpoint import search_tmdb_any, search_tmdb_tv, search_tmdb_movies
+
+# Upload endpoint with optimization (not reading entire file into memory)
+async def upload_file(request: web.Request):
+    data = await request.post()
+    file = data.get('file').file
+    chunk = file.read()  # Read the file in chunks to avoid memory overload
+    file_details = dict(
+        user_id="thebinary1",
+        dropzone_id=str(data["dzuuid"]),
+        file=dict(
+            file_id=str(data["dzuuid"]),
+            file_unique_id=str(data["dzuuid"]),
+            file_name=str(data.get('file').filename),
+            file_size=int(data["dztotalfilesize"]),
+            mime_type=mime_identifier(str(data.get('file').filename)),
+            part_size=int(data["dzchunksize"]),
+            file_part=int(data["dzchunkindex"]),
+            total_parts=int(data["dztotalchunkcount"])
+        ),
+        time=Time_ISTKolNow(),
+        user_type="WEB",
+        privacy_type="PRIVATE"
+    )
+    
+    client_req = await req_client()  # Ensure client request is fast and optimized
+    tg_connect = TeleUploader(client_req["client"])
+    main = await tg_connect.upload_web_file(file_details, chunk)
+    
+    return web.json_response({
+        "status": main.get("status"),
+        "message": main.get("message")
+    })

FileStream/server/APP/__init__.py

@@ -0,0 +1,17 @@
+from aiohttp import web
+from aiohttp.http_exceptions import BadStatusLine
+
+from .Functions.downloader import media_streamer
+from ...Exceptions import FIleNotFound, InvalidHash
+from .render_template import render_page, render_upload
+from .routes_app import stream_handler,upload_handler
+
+
+
+async def handle_v2(request):
+    return web.Response(text="Hello from app v2!")
+
+sub_app = web.Application()
+sub_app.router.add_get('/', handle_v2)
+sub_app.router.add_get('/watch/{path}', stream_handler)
+sub_app.router.add_get('/up', upload_handler)

FileStream/server/{render_template.py → APP/render_template.py}

@@ -1,5 +1,5 @@
-import aiohttp
 import jinja2
+import aiohttp
 import urllib.parse
 from FileStream.config import Telegram, Server
 from FileStream.Database import Database

FileStream/server/{routes_app.py → APP/routes_app.py}

@@ -6,10 +6,6 @@ from FileStream.server.exceptions import FIleNotFound, InvalidHash
 from FileStream.server.render_template import render_page, render_upload
 
 
-async def handle_v2(request):
-    return web.Response(text="Hello from app v2!")
-
-
 #@sub_app.get("/watch/{path}", allow_head=True)
 async def stream_handler(request: web.Request):
   try:
@@ -35,7 +31,3 @@ async def upload_handler(request: web.Request):
   except (AttributeError, BadStatusLine, ConnectionResetError):
     pass
 
-sub_app = web.Application()
-sub_app.router.add_get('/', handle_v2)
-sub_app.router.add_get('/watch/{path}', stream_handler)
-sub_app.router.add_get('/up', upload_handler)

FileStream/server/Exceptions/__init__.py

@@ -0,0 +1,2 @@
+
+from .exceptions import FIleNotFound, InvalidHash

FileStream/server/Functions/__init__.py

@@ -0,0 +1 @@
+from .downloader import media_streamer

FileStream/server/Functions/downloader.py

@@ -15,8 +15,7 @@ from FileStream.bot import req_client, FileStream
 from FileStream import utils, StartTime, __version__
 from FileStream.Tools import mime_identifier, Time_ISTKolNow
 from FileStream.bot import MULTI_CLIENTS, WORK_LOADS, ACTIVE_CLIENTS
-from FileStream.server.exceptions import FIleNotFound, InvalidHash
-from FileStream.server.render_template import render_page, render_upload
+from FileStream.server.Exceptions import FIleNotFound, InvalidHash
 from FileStream.utils.FileProcessors.custom_ul import  TeleUploader
 
 
@@ -36,7 +35,7 @@ async def media_streamer(request: web.Request, db_id: str, speed: str):
         logging.debug(f"Creating new ByteStreamer object for client {client['index']}")
         tg_connect = utils.ByteStreamer(client['client'])
         ACTIVE_CLIENTS[client['client']] = tg_connect
-        
+
     else:
         tg_connect.update_last_activity()
         logging.debug(f"Using cached ByteStreamer object for client {client['index']}")

FileStream/server/__init__.py

@@ -3,9 +3,9 @@ import logging
 from aiohttp import web
 
 #-----------------------Local Imports-------------------------#
-from .routes_api import api
+from .API import api
 from .routes_main import routes
-from .routes_app import sub_app
+from .APP import sub_app
 from FileStream.bot import MULTI_CLIENTS, WORK_LOADS, ACTIVE_CLIENTS
 
 

FileStream/server/routes_main.py

@@ -9,14 +9,11 @@ from pyrogram import raw
 from aiohttp.http_exceptions import BadStatusLine
 
 #---------------------Local Upload---------------------#
-from FileStream.config import Telegram
 from FileStream.bot import FileStream
 from FileStream.bot import MULTI_CLIENTS, WORK_LOADS
-from FileStream.server.exceptions import FIleNotFound, InvalidHash
 from FileStream import utils, StartTime, __version__
-from FileStream.utils.FileProcessors.custom_ul import TeleUploader
 from FileStream.Tools import mime_identifier, Time_ISTKolNow
-from FileStream.server.render_template import render_page, render_upload
+
 
 tasks = []
 routes = web.RouteTableDef()