Update app.py

app.py

@@ -1,5 +1,5 @@
-from fastapi import FastAPI, File, UploadFile, Request
-from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
+from fastapi import FastAPI, File, UploadFile, Request, HTTPException
+from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse, RedirectResponse
 import requests
 import time
 import asyncio
@@ -821,16 +821,12 @@ HTML_CONTENT = """
         }
 
         function encryptUrl(url) {
-            const key = generateEncryptionKey();
+            const browserInfo = navigator.userAgent + navigator.language + screen.width + screen.height + new Date().getTimezoneOffset();
+            const key = CryptoJS.SHA256(browserInfo).toString();
             const encryptedData = CryptoJS.AES.encrypt(url, key).toString();
-            const encryptedUrl = `${window.location.origin}/decrypt?data=${encodeURIComponent(encryptedData)}&key=${encodeURIComponent(key)}`;
+            const encryptedUrl = `${window.location.origin}/decrypt?data=${encodeURIComponent(encryptedData)}`;
             return encryptedUrl;
         }
-
-        function generateEncryptionKey() {
-            const browserInfo = navigator.userAgent + navigator.language + screen.width + screen.height + new Date().getTimezoneOffset();
-            return CryptoJS.SHA256(browserInfo).toString();
-        }
     </script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>
 </body>
@@ -927,12 +923,15 @@ async def embed_video(url: str, thumbnail: str):
     return HTMLResponse(content=html)
 
 @app.get("/decrypt")
-async def decrypt_url(data: str, key: str):
+async def decrypt_url(data: str, request: Request):
     try:
-        decrypted_url = Fernet(key.encode()).decrypt(data.encode()).decode()
+        browser_info = request.headers.get('User-Agent', '') + request.headers.get('Accept-Language', '') + str(request.client.host)
+        key = hashlib.sha256(browser_info.encode()).hexdigest()
+        fernet = Fernet(base64.urlsafe_b64encode(key[:32].encode()))
+        decrypted_url = fernet.decrypt(data.encode()).decode()
         return RedirectResponse(url=decrypted_url)
-    except:
-        return HTMLResponse(content="Invalid or expired link", status_code=400)
+    except Exception as e:
+        raise HTTPException(status_code=400, detail="Invalid or expired link")
 
 async def get_cookies() -> Dict[str, str]:
     try:
@@ -975,7 +974,7 @@ async def upload_file(upload_url: str, file_content: bytes, content_type: str) -
         return False
 
 async def retry_upload(upload_url: str, file_content: bytes, content_type: str, max_retries: int = 5, delay: int = 1) -> bool:
-    while True:
+    for _ in range(max_retries):
         try:
             success = await upload_file(upload_url, file_content, content_type)
             if success:
@@ -985,7 +984,7 @@ async def retry_upload(upload_url: str, file_content: bytes, content_type: str,
             print(f"Error during upload: {e}")
         
         await asyncio.sleep(delay)
-        delay = min(delay * 2, 60)  
+        delay = min(delay * 2, 60) 
     
     return False