Code Updates & Optimizations

Dockerfile

@@ -1,20 +1,34 @@
 FROM python:3.11
+
+# Create and use a non-root user
 RUN useradd -ms /bin/bash admin
-RUN rm -rf /app/*
+
+# Set working directory for the application
 WORKDIR /app
-COPY . /app
-COPY requirement.txt ./requirements.txt
+
+# Copy only the necessary files first for better cache utilization
+COPY requirements.txt /app/requirements.txt
+
+# Install system dependencies and clean up in a single RUN step to reduce layers
 RUN apt-get update -y && apt-get upgrade -y \
-    && apt-get install \
+    && apt-get install -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install --no-cache-dir --upgrade --requirement requirements.txt
-RUN chown -R admin:admin /app
-RUN chmod 777 /app
-#RUN chmod 664 /app
+# Install Python dependencies from the requirements file
+RUN pip3 install --no-cache-dir --upgrade -r requirements.txt
+
+# Copy the rest of the application code after installing dependencies for better cache
+COPY . /app
+
+# Set ownership and permissions for the app directory
+RUN chown -R admin:admin /app && chmod -R 777 /app
+
+# Switch to the non-root user for better security
 USER admin
+
+# Expose the port the application will run on
 EXPOSE 7860
-#CMD ["uvicorn", "live:app", "--host", "0.0.0.0", "--port", "7860"]
-#CMD ["bash", "start"]
-CMD ["python","-u", "-m", "FileStream"]
+
+# Command to run the application
+CMD ["python", "-u", "-m", "FileStream"]

FileStream/server/Functions/downloader.py

@@ -6,15 +6,14 @@ import asyncio
 import traceback
 from aiohttp import web
 from pyrogram import raw
-
 from aiohttp.http_exceptions import BadStatusLine
 
 #---------------------Local Upload---------------------#
 
 from FileStream.config import Telegram
+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 req_client, FileStream
 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
@@ -67,7 +66,7 @@ async def media_streamer(request: web.Request, db_id: str, speed: str):
         offset, first_part_cut, last_part_cut, part_count = compute_offsets(from_bytes, until_bytes, chunk_size)
 
         # Request the file chunks
-        body = await tg_connect.yield_file(
+        body = tg_connect.yield_file(
             file_id, client['index'], offset, first_part_cut, last_part_cut, part_count, chunk_size
         )
 

Unused Codes/Dockerfile_old

@@ -0,0 +1,20 @@
+FROM python:3.11
+RUN useradd -ms /bin/bash admin
+RUN rm -rf /app/*
+WORKDIR /app
+COPY . /app
+COPY requirement.txt ./requirements.txt
+RUN apt-get update -y && apt-get upgrade -y \
+    && apt-get install \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install --no-cache-dir --upgrade --requirement requirements.txt
+RUN chown -R admin:admin /app
+RUN chmod 777 /app
+#RUN chmod 664 /app
+USER admin
+EXPOSE 7860
+#CMD ["uvicorn", "live:app", "--host", "0.0.0.0", "--port", "7860"]
+#CMD ["bash", "start"]
+CMD ["python","-u", "-m", "FileStream"]