v2

app.py

@@ -2,47 +2,44 @@ import os
 import uuid
 import time
 import shutil
-import threading
+import asyncio
+from contextlib import asynccontextmanager
 from fastapi import FastAPI, UploadFile, File, Form, HTTPException
 from fastapi.responses import FileResponse, HTMLResponse
-from fastapi.staticfiles import StaticFiles
-import pyshorteners
-
-app = FastAPI()
 
 # Configuration
 UPLOAD_DIR = "temp_storage"
 PORT = 7860
 os.makedirs(UPLOAD_DIR, exist_ok=True)
 
-# Helper to shorten links
-def shorten_url(long_url):
-    try:
-        s = pyshorteners.Shortener()
-        return s.tinyurl.short(long_url)
-    except:
-        return long_url # Fallback to long URL if shortening fails
-
 # Background task to clean up expired files
-def cleanup_task():
+async def cleanup_task():
     while True:
         now = time.time()
-        for subdir in os.listdir(UPLOAD_DIR):
-            path = os.path.join(UPLOAD_DIR, subdir)
-            if os.path.isdir(path):
-                # Check metadata file for expiration
-                meta_path = os.path.join(path, "expiry.txt")
-                if os.path.exists(meta_path):
-                    with open(meta_path, "r") as f:
-                        expiry_time = float(f.read())
-                    if now > expiry_time:
-                        shutil.rmtree(path)
-                        print(f"[*] Expired and deleted: {subdir}")
-        time.sleep(60) # Run every minute
-
-@app.on_event("startup")
-async def startup_event():
-    threading.Thread(target=cleanup_task, daemon=True).start()
+        if os.path.exists(UPLOAD_DIR):
+            for subdir in os.listdir(UPLOAD_DIR):
+                path = os.path.join(UPLOAD_DIR, subdir)
+                if os.path.isdir(path):
+                    meta_path = os.path.join(path, "expiry.txt")
+                    if os.path.exists(meta_path):
+                        with open(meta_path, "r") as f:
+                            expiry_time = float(f.read())
+                        if now > expiry_time:
+                            shutil.rmtree(path)
+                            print(f"[*] Expired and deleted: {subdir}")
+        await asyncio.sleep(60)
+
+# Lifespan handler (Replaces on_event)
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    # Startup logic
+    loop = asyncio.get_event_loop()
+    task = loop.create_task(cleanup_task())
+    yield
+    # Shutdown logic
+    task.cancel()
+
+app = FastAPI(lifespan=lifespan)
 
 @app.post("/upload")
 async def upload_file(
@@ -66,15 +63,13 @@ async def upload_file(
     with open(os.path.join(save_path, "expiry.txt"), "w") as f:
         f.write(str(expiry_timestamp))
         
-    # Generate Link
-    long_link = f"{base_url.rstrip('/')}/download/{file_id}/{file.filename}"
-    short_link = shorten_url(long_link)
+    # Generate direct link (TinyURL removed)
+    direct_link = f"{base_url.rstrip('/')}/download/{file_id}/{file.filename}"
     
     return {
         "status": "success",
-        "short_link": short_link,
-        "expires_in_hours": expiry_hours,
-        "uid": file_id
+        "link": direct_link,
+        "expires_in_hours": expiry_hours
     }
 
 @app.get("/download/{uid}/{filename}")
@@ -87,24 +82,84 @@ async def download_file(uid: str, filename: str):
 @app.get("/", response_class=HTMLResponse)
 async def main_page():
     return """
+    <!DOCTYPE html>
     <html>
-        <head><title>File Tunnel</title></head>
-        <body style="font-family: sans-serif; display: flex; flex-direction: column; align-items: center; padding-top: 50px;">
-            <h2>Temporary File Tunnel</h2>
-            <form action="/upload" method="post" enctype="multipart/form-data" style="border: 1px solid #ccc; padding: 20px; border-radius: 8px;">
-                <input type="file" name="file" required><br><br>
-                <label>Expire in (hours, max 24):</label><br>
-                <input type="number" name="expiry_hours" value="2" step="0.5" max="24"><br><br>
-                <input type="hidden" name="base_url" id="base_url">
-                <button type="submit">Generate Secure Link</button>
-            </form>
-            <script>
-                document.getElementById('base_url').value = window.location.origin;
-            </script>
-        </body>
+    <head>
+        <title>File Tunnel</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <style>
+            body { font-family: -apple-system, sans-serif; display: flex; flex-direction: column; align-items: center; padding: 20px; background: #f4f4f9; }
+            .card { background: white; padding: 2rem; border-radius: 12px; box-shadow: 0 4px 6px rgba(0,0,0,0.1); width: 100%; max-width: 400px; }
+            input, button { width: 100%; margin: 10px 0; padding: 10px; border-radius: 6px; border: 1px solid #ccc; box-sizing: border-box; }
+            button { background: #007bff; color: white; border: none; cursor: pointer; font-weight: bold; }
+            #progress-container { width: 100%; background: #eee; border-radius: 10px; display: none; margin: 15px 0; }
+            #progress-bar { width: 0%; height: 10px; background: #28a745; border-radius: 10px; transition: width 0.2s; }
+            #result { margin-top: 15px; word-break: break-all; padding: 10px; background: #e9ecef; border-radius: 6px; display: none; }
+        </style>
+    </head>
+    <body>
+        <div class="card">
+            <h2>File Tunnel</h2>
+            <input type="file" id="fileInput">
+            <label>Expiry (Hours, max 24):</label>
+            <input type="number" id="expiryInput" value="2" step="0.5" max="24">
+            <button onclick="uploadFile()" id="uploadBtn">Generate Link</button>
+            
+            <div id="progress-container">
+                <div id="progress-bar"></div>
+            </div>
+            
+            <div id="result"></div>
+        </div>
+
+        <script>
+            function uploadFile() {
+                const fileInput = document.getElementById('fileInput');
+                const expiryInput = document.getElementById('expiryInput');
+                const resultDiv = document.getElementById('result');
+                const progContainer = document.getElementById('progress-container');
+                const progBar = document.getElementById('progress-bar');
+                const btn = document.getElementById('uploadBtn');
+
+                if (!fileInput.files[0]) return alert("Select a file first!");
+
+                const formData = new FormData();
+                formData.append("file", fileInput.files[0]);
+                formData.append("expiry_hours", expiryInput.value);
+                formData.append("base_url", window.location.origin);
+
+                const xhr = new XMLHttpRequest();
+                xhr.open("POST", "/upload", true);
+
+                progContainer.style.display = "block";
+                resultDiv.style.display = "none";
+                btn.disabled = true;
+
+                xhr.upload.onprogress = (e) => {
+                    if (e.lengthComputable) {
+                        const percent = (e.loaded / e.total) * 100;
+                        progBar.style.width = percent + "%";
+                    }
+                };
+
+                xhr.onload = () => {
+                    btn.disabled = false;
+                    const res = JSON.parse(xhr.responseText);
+                    if (xhr.status === 200) {
+                        resultDiv.style.display = "block";
+                        resultDiv.innerHTML = `<strong>Link Generated:</strong><br><a href="${res.link}" target="_blank">${res.link}</a><br><br><small>Expires in ${res.expires_in_hours}h</small>`;
+                    } else {
+                        alert("Upload failed.");
+                    }
+                };
+
+                xhr.send(formData);
+            }
+        </script>
+    </body>
     </html>
     """
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=PORT)
+    uvicorn.run(app, host="0.0.0.0", port=7860)