Update app.py

app.py

@@ -1,29 +1,29 @@
 from fastapi import FastAPI, Request, UploadFile, File
-from fastapi.responses import FileResponse
+from fastapi.responses import StreamingResponse
 import threading
 import os
 import zipfile
 import time
+from io import BytesIO
 
 app = FastAPI()
 lock = threading.Lock()
 
-# -------- OLD (keep unchanged) --------
+# -------- STORAGE --------
 channels = {}
 update_ids = {}
 
-# -------- NEW STORAGE --------
-file_channels = {}  # channel অনুযায়ী file list
+file_channels = {}
 
 UPLOAD_DIR = "uploads"
 os.makedirs(UPLOAD_DIR, exist_ok=True)
 
 
-# -------- OLD TEXT --------
+# -------- SEND TEXT --------
 @app.post("/sendMessage/{channel}")
 async def send_message(channel: str, req: Request):
     data = await req.body()
-    text = data.decode("utf-8").strip()
+    text = data.decode("utf-8", errors="ignore").strip()
 
     with lock:
         if channel not in channels:
@@ -40,57 +40,74 @@ async def send_message(channel: str, req: Request):
     return {"ok": True}
 
 
-# -------- NEW FILE UPLOAD --------
+# -------- SEND FILE --------
 @app.post("/sendFile/{channel}")
 async def send_file(channel: str, files: list[UploadFile] = File(...)):
+    saved_files = []
+
     with lock:
         if channel not in file_channels:
             file_channels[channel] = []
 
-    saved_files = []
-
     for file in files:
-        filename = f"{int(time.time())}_{file.filename}"
+        filename = f"{int(time.time()*1000)}_{file.filename}"
         filepath = os.path.join(UPLOAD_DIR, filename)
 
-        with open(filepath, "wb") as f:
-            f.write(await file.read())
+        try:
+            content = await file.read()
+            with open(filepath, "wb") as f:
+                f.write(content)
+
+            with lock:
+                file_channels[channel].append(filepath)
 
-        with lock:
-            file_channels[channel].append(filepath)
+            saved_files.append(filename)
 
-        saved_files.append(filename)
+        except Exception as e:
+            saved_files.append(f"error:{file.filename}")
 
     return {"ok": True, "files": saved_files}
 
 
-# -------- MODIFIED GET (text + file zip) --------
+# -------- GET UPDATES (TEXT + FILE) --------
 @app.get("/getUpdates/{channel}")
 def get_updates(channel: str):
+
     with lock:
-        # text messages
         msgs = channels.get(channel, []).copy()
         channels[channel] = []
 
-        # files
         files = file_channels.get(channel, []).copy()
         file_channels[channel] = []
 
-    # যদি file থাকে → zip বানাও
+    # -------- CASE 1: FILE EXISTS --------
     if files:
-        zip_name = f"{channel}_files.zip"
-        zip_path = os.path.join(UPLOAD_DIR, zip_name)
+        mem_zip = BytesIO()
+
+        with zipfile.ZipFile(mem_zip, "w", zipfile.ZIP_DEFLATED) as zipf:
 
-        with zipfile.ZipFile(zip_path, "w") as zipf:
+            # add files
             for file_path in files:
                 if os.path.exists(file_path):
                     zipf.write(file_path, os.path.basename(file_path))
 
-        return FileResponse(
-            zip_path,
+            # add text হিসেবে messages.txt
+            if msgs:
+                text_content = "\n".join([m.get("text", "") for m in msgs])
+                zipf.writestr("messages.txt", text_content)
+
+        mem_zip.seek(0)
+
+        return StreamingResponse(
+            mem_zip,
             media_type="application/zip",
-            filename=zip_name
+            headers={
+                "Content-Disposition": f"attachment; filename={channel}_data.zip"
+            }
         )
 
-    # না থাকলে text return
-    return {"ok": True, "result": msgs}
+    # -------- CASE 2: ONLY TEXT --------
+    return {
+        "ok": True,
+        "result": msgs if msgs else []
+    }