refactor: reorganized folders and updated some logic

* Reorganized project structure
* Updated some function logic
* Removed unused functions
* Changed file info caching logic

Author: DeekshithSH

README.md

@@ -130,6 +130,8 @@ you may also add as many as bots you want. (max limit is not tested yet)
 > **Note**
 > Leave this field empty and anyone will be able to use your bot instance.
 
+`CACHE_SIZE` (default: 128) — Maximum number of file info entries cached per client. Each client (including those using MULTI_TOKEN) gets its own separate cache of this size
+
 `CHUNK_SIZE`: Size of the chunk to request from Telegram server when streaming a file [See more](https://core.telegram.org/api/files#downloading-files)
 
 `CONNECTION_LIMIT`:  (default 20) - The maximum number of connections to a single Telegram datacenter.
@@ -154,8 +156,6 @@ you may also add as many as bots you want. (max limit is not tested yet)
 
 `SLEEP_THRESHOLD` : Set a sleep threshold for flood wait exceptions happening globally in this telegram bot instance, below which any request that raises a flood wait will be automatically invoked again after sleeping for the required amount of time. Flood wait exceptions requiring higher waiting times will be raised. Defaults to 60 seconds.
 
-`STREAM_MEDIA`: (default false, can be either `True` or `False`) If you want to play the media (audio or video) in browser
-
 `TRUST_HEADERS`: (defaults to true) - Whether or not to trust X-Forwarded-For headers when logging requests.
 
 `WEB_SERVER_BIND_ADDRESS` : Your server bind address. Defauls to `0.0.0.0`

WebStreamer/__main__.py

@@ -6,16 +6,13 @@
 import logging
 import logging.handlers as handlers
 
-
 from aiohttp import web
-from WebStreamer.bot import StreamBot, BotInfo
-from WebStreamer.server import web_server
-from WebStreamer.utils.keepalive import ping_server
-from WebStreamer.utils.util import load_plugins, startup
-from WebStreamer.bot.clients import initialize_clients
+from .stream_routes import routes
+from .utils.keepalive import ping_server
+from .utils.util import load_plugins, startup
+from .clients import StreamBot, initialize_clients
 from .vars import Var
 
-
 logging.basicConfig(
     level=logging.DEBUG if Var.DEBUG else logging.INFO,
     datefmt="%d/%m/%Y %H:%M:%S",
@@ -27,13 +24,9 @@
 logging.getLogger("aiohttp.web").setLevel(logging.DEBUG if Var.DEBUG else logging.ERROR)
 logging.getLogger("telethon").setLevel(logging.INFO if Var.DEBUG else logging.ERROR)
 
-server = web.AppRunner(web_server())
-
-#if sys.version_info[1] > 9:
-#    loop = asyncio.new_event_loop()
-#    asyncio.set_event_loop(loop)
-#else:
-loop = asyncio.get_event_loop()
+app = web.Application(client_max_size=1024*8) # 8KB
+app.add_routes(routes)
+server = web.AppRunner(app)
 
 async def start_services():
     logging.info("Initializing Telegram Bot")
@@ -45,8 +38,8 @@ async def start_services():
         logging.error("Bin Channel not found. Please ensure the bot has been added to the bin channel.")
         return
     bot_info = await StreamBot.get_me()
-    BotInfo.username = bot_info.username
-    BotInfo.fname=bot_info.first_name
+    Var.USERNAME = bot_info.username
+    Var.FIRST_NAME=bot_info.first_name
     logging.info("Initialized Telegram Bot")
     logging.info("Initializing Clients")
     await initialize_clients()
@@ -58,7 +51,7 @@ async def start_services():
             logging.warning("Bin Channel is a group. Use a channel for multi-client support.")
     if not Var.NO_UPDATE:
         logging.info('Importing plugins')
-        load_plugins("WebStreamer/bot/plugins")
+        load_plugins("WebStreamer/plugins")
         logging.info("Imported Plugins")
     if Var.KEEP_ALIVE:
         logging.info("Starting Keep Alive Service")
@@ -67,23 +60,26 @@ async def start_services():
     await server.setup()
     await web.TCPSite(server, Var.BIND_ADDRESS, Var.PORT).start()
     logging.info("Service Started")
-    logging.info("bot =>> %s", BotInfo.fname)
+    logging.info("bot =>> %s", Var.FIRST_NAME)
     logging.info("DC ID =>> %s", str(StreamBot.session.dc_id))
     logging.info(" URL =>> %s", Var.URL)
     await StreamBot.run_until_disconnected()
 
+async def main():
+    try:
+        await start_services()
+    finally:
+        await cleanup()
+        logging.info("Stopped Services")
+
 async def cleanup():
     await server.cleanup()
     await StreamBot.disconnect()
 
 if __name__ == "__main__":
     try:
-        loop.run_until_complete(start_services())
+        asyncio.run(main())
     except KeyboardInterrupt:
         pass
-    except Exception as err:
+    except Exception:
         logging.error(traceback.format_exc())
-    finally:
-        loop.run_until_complete(cleanup())
-        loop.stop()
-        logging.info("Stopped Services")

WebStreamer/bot/__init__.py

@@ -6,10 +6,19 @@
 from os import environ
 from telethon import TelegramClient
 from telethon.sessions import MemorySession
-from WebStreamer.utils.util import startup
-from ..vars import Var
-from . import multi_clients, work_loads, StreamBot
+from .utils.util import startup
+from .vars import Var
 
+multi_clients: dict[int, TelegramClient] = {}
+work_loads: dict[int, int] = {}
+
+StreamBot = TelegramClient(
+    session="WebStreamer",
+    api_id=Var.API_ID,
+    api_hash=Var.API_HASH,
+    flood_sleep_threshold=Var.SLEEP_THRESHOLD,
+    receive_updates=not Var.NO_UPDATE
+)
 
 async def initialize_clients():
     multi_clients[0] = StreamBot
@@ -51,7 +60,7 @@ async def start_client(client_id, token):
             logging.error("Failed starting Client - %s Error:", client_id, exc_info=True)
 
     clients = await asyncio.gather(*[start_client(i, token) for i, token in all_tokens.items()])
-    multi_clients.update(dict(clients))
+    multi_clients.update(dict(filter(None,clients)))
     if len(multi_clients) != 1:
         Var.MULTI_CLIENT = True
         logging.info("Multi-client mode enabled")

WebStreamer/bot/clients.py WebStreamer/clients.pyWebStreamer/bot/clients.py renamed to WebStreamer/clients.py

@@ -1,10 +1,11 @@
 # This file is a part of TG-FileStreamBot
+# pylint: disable=relative-beyond-top-level
 
 from telethon.extensions import html
 from telethon.events import NewMessage
-from WebStreamer import __version__
-from WebStreamer.bot import StreamBot
-from WebStreamer.vars import Var
+from .. import __version__
+from ..clients import StreamBot
+from ..vars import Var
 
 @StreamBot.on(NewMessage(incoming=True,pattern=r"^\/start*", func=lambda e: e.is_private))
 async def start(event: NewMessage.Event):
@@ -16,7 +17,7 @@ async def start(event: NewMessage.Event):
             parse_mode=html
         )
     await event.message.reply(
-        message=f'Hi <a href="tg://user?id={event.chat_id}">{event.chat.first_name}</a>, Send me a file to get an instant stream link.',
+        message=f'Hi <a href="tg://user?id={user.id}">{user.first_name}</a>, Send me a file to get an instant stream link.',
         link_preview=False,
         parse_mode=html
     )
@@ -27,9 +28,9 @@ async def about(event: NewMessage.Event):
         message=f"""
 Maintained By: <a href="https://github.com/DeekshithSH">DeekshithSH</a>
 Source Code: <a href="https://github.com/SpringsFern/TG-FileStreamBot">TG-FileStreamBot</a>
-Based On: [<a href="bit.ly/tg-stream">tg filestream</a>] [<a href="https://github.com/EverythingSuckz/TG-FileStreamBot">TG-FileStreamBot</a>]
+Based On: [<a href="https://github.com/tulir/TGFileStream/">tg filestream</a>] [<a href="https://github.com/EverythingSuckz/TG-FileStreamBot">TG-FileStreamBot</a>]
 Version: {__version__}
-Last Updated: 15 March 20225
+Last Updated: 08 April 2025
 """,
         link_preview=False,
         parse_mode=html

WebStreamer/bot/plugins/start.py WebStreamer/plugins/start.pyWebStreamer/bot/plugins/start.py renamed to WebStreamer/plugins/start.py

@@ -1,12 +1,15 @@
 # This file is a part of TG-FileStreamBot
+# pylint: disable=relative-beyond-top-level
 
 import logging
 from telethon import Button, errors
 from telethon.events import NewMessage
 from telethon.extensions import html
-from WebStreamer.bot import StreamBot
-from WebStreamer.utils.file_properties import get_file_info, pack_file, get_short_hash
-from WebStreamer.vars import Var
+from ..clients import StreamBot
+from ..utils.file_properties import get_file_info, pack_file, get_short_hash
+from ..vars import Var
+
+MEDIA={"video", "audio"} # we can expand it to include more media types
 
 @StreamBot.on(NewMessage(func=lambda e: True if e.message.file and e.is_private else False))
 async def media_receive_handler(event: NewMessage.Event):
@@ -28,13 +31,16 @@ async def media_receive_handler(event: NewMessage.Event):
         )
         file_hash=get_short_hash(full_hash)
         stream_link = f"{Var.URL}stream/{log_msg.id}?hash={file_hash}"
-
+        is_media = bool(set(file_info.mime_type.split("/")) & MEDIA)
+        buttons=[[Button.url("Open", url=stream_link)]]
+        message=f"<code>{stream_link}</code>"
+        if is_media:
+            buttons.append([Button.url("Stream", url=stream_link+"&s=1")])
+            message+=f"<a href='{stream_link}&s=1'>(Stream)</a>"
         await event.message.reply(
-            message=f"<code>{stream_link}</code>",
+            message=message,
             link_preview=False,
-            buttons=[
-            [Button.url("Open", url=stream_link)]
-            ],
+            buttons=buttons,
             parse_mode=html
         )
     except errors.FloodWaitError as e:

WebStreamer/bot/plugins/stream.py WebStreamer/plugins/stream.pyWebStreamer/bot/plugins/stream.py renamed to WebStreamer/plugins/stream.py

@@ -6,13 +6,12 @@
 import mimetypes
 from aiohttp import web
 from aiohttp.http_exceptions import BadStatusLine
-from WebStreamer.bot import multi_clients, work_loads, BotInfo
-from WebStreamer.utils.file_properties import get_short_hash, pack_file
-from WebStreamer.utils.util import allow_request, get_requester_ip, get_readable_time
-from WebStreamer.vars import Var
-from WebStreamer.server.exceptions import FIleNotFound, InvalidHash
-from WebStreamer import StartTime, __version__
-from WebStreamer.utils.paralleltransfer import ParallelTransferrer
+from .clients import multi_clients, work_loads
+from .utils.file_properties import get_short_hash, pack_file
+from .utils.util import allow_request, get_requester_ip, get_readable_time
+from .vars import Var
+from . import StartTime, __version__
+from .utils.paralleltransfer import ParallelTransferrer
 
 
 routes = web.RouteTableDef()
@@ -24,7 +23,7 @@ async def root_route_handler(_: web.Request):
         {
             "server_status": "running",
             "uptime": get_readable_time(time.time() - StartTime),
-            "telegram_bot": "@" + BotInfo.username,
+            "telegram_bot": "@" + Var.USERNAME,
             "connected_bots": len(multi_clients),
             "loads": dict(
                 (f"bot{c + 1}", l)
@@ -43,10 +42,6 @@ async def stream_handler(request: web.Request):
         message_id = int(request.match_info["messageID"])
         secure_hash = request.rel_url.query.get("hash")
         return await media_streamer(request, message_id, secure_hash)
-    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
     except Exception as e:
@@ -75,9 +70,8 @@ async def media_streamer(request: web.Request, message_id: int, secure_hash: str
         class_cache[faster_client] = transfer
         logging.debug("Created new ByteStreamer object for client %s", index)
     logging.debug("before calling get_file_properties")
-    try:
-        file_id = await transfer.get_file_properties(message_id)
-    except FIleNotFound:
+    file_id = await transfer.get_file_properties(message_id)
+    if not file_id:
         return web.Response(status=404, text="File not found")
 
     full_hash = pack_file(
@@ -88,7 +82,7 @@ async def media_streamer(request: web.Request, message_id: int, secure_hash: str
     )
     if get_short_hash(full_hash) != secure_hash:
         logging.debug("Invalid hash for message with ID %s", message_id)
-        raise InvalidHash
+        return web.HTTPForbidden(text="Invalid hash")
 
     file_size = file_id.file_size
 
@@ -125,7 +119,7 @@ async def media_streamer(request: web.Request, message_id: int, secure_hash: str
         mime_type = mimetypes.guess_type(
             file_name)[0] or "application/octet-stream"
 
-    if ("video/" in mime_type or "audio/" in mime_type) and Var.STREAM_MEDIA:
+    if request.rel_url.query.get("s"):
         disposition = "inline"
 
     return web.Response(