Update app.py

app.py

@@ -2,19 +2,17 @@ import os
 import subprocess
 import threading
 from fastapi import FastAPI, Request
-from fastapi.responses import JSONResponse
-import httpx
+from fastapi.responses import JSONResponse, HTMLResponse
+import httpx 
 
-app = FastAPI()
+app = FastAPI(docs_url=None, redoc_url=None) # Disable HF Native Docs so Userbot Docs take over
 
-# Clean env variables (removes newline issues)
-GITHUB_USERNAME = os.getenv("GITHUB_USERNAME", "").strip()
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", "").strip()
-REPO_NAME = os.getenv("REPO_NAME", "").strip()
-
-# Userbot internal API port
-USERBOT_API_PORT = 8888
+GITHUB_USERNAME = os.getenv("GITHUB_USERNAME")
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
+REPO_NAME = os.getenv("REPO_NAME")
 
+# Your userbot's internal port
+USERBOT_API_PORT = 8888  
 
 def clone_repo():
     if not os.path.exists("repo"):
@@ -23,103 +21,79 @@ def clone_repo():
         else:
             repo_url = f"https://github.com/{GITHUB_USERNAME}/{REPO_NAME}.git"
 
-        print(f"Cloning repository: {GITHUB_USERNAME}/{REPO_NAME}")
+        print(f"Cloning repo: {GITHUB_USERNAME}/{REPO_NAME}")
         subprocess.run(["git", "clone", repo_url, "repo"], check=True)
 
-
 def install_requirements():
     req_file = "repo/requirements.txt"
     if os.path.exists(req_file):
-        print("Installing requirements...")
-        subprocess.run(
-            ["pip", "install", "--no-cache-dir", "-r", req_file],
-            check=True
-        )
-
+        subprocess.run(["pip", "install", "--no-cache-dir", "-r", req_file], check=True)
 
 def start_script():
-    startup_path = "repo/startup"
-
-    if os.path.exists(startup_path):
-        print("Running startup script...")
-        subprocess.Popen(["bash", "startup"], cwd="repo")
-    else:
-        print("startup script not found!")
-
+    subprocess.Popen(["bash", "startup"], cwd="repo")
 
 def run_app():
-    try:
-        clone_repo()
-        install_requirements()
-        start_script()
-    except Exception as e:
-        print(f"Startup error: {e}")
-
+    clone_repo()
+    install_requirements()
+    start_script()
 
 @app.on_event("startup")
 def startup_event():
     threading.Thread(target=run_app).start()
 
-
 @app.get("/")
 def home():
-    return {
-        "status": "repo cloned, requirements installed, startup script running 🚀"
-    }
-
+    return {"status": "Repo cloned, requirements installed, start script running 🚀"}
 
-# -------------------------
-# Proxy /api → port 8888
-# -------------------------
+# --- MAGIC PROXY SYSTEM ---
 
-@app.api_route("/api/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH"])
-async def proxy_to_userbot(request: Request, path: str):
-
-    url = f"http://127.0.0.1:{USERBOT_API_PORT}/api/{path}"
+@app.get("/status")
+async def proxy_status():
+    try:
+        async with httpx.AsyncClient() as client:
+            response = await client.get(f"http://127.0.0.1:{USERBOT_API_PORT}/status")
+            return response.json()
+    except Exception:
+         return {"error": "Userbot API is strictly booting up. Give it a second!"}
 
+# Forward URL/docs Swagger UI from Userbot
+@app.get("/docs")
+async def proxy_docs(request: Request):
     headers = dict(request.headers)
-    headers.pop("host", None)
-
-    body = await request.body()
-
+    headers.pop("host", None) 
     try:
-        async with httpx.AsyncClient(timeout=120) as client:
-
-            response = await client.request(
-                request.method,
-                url,
-                headers=headers,
-                content=body
-            )
-
-            try:
-                return JSONResponse(
-                    status_code=response.status_code,
-                    content=response.json()
-                )
-            except Exception:
-                return JSONResponse(
-                    status_code=response.status_code,
-                    content={"response": response.text}
-                )
-
-    except Exception as e:
-        return JSONResponse(
-            status_code=502,
-            content={
-                "error": "Userbot API is offline or still booting",
-                "exception": str(e)
-            }
-        )
-
+        async with httpx.AsyncClient() as client:
+            response = await client.get(f"http://127.0.0.1:{USERBOT_API_PORT}/docs", headers=headers)
+            return HTMLResponse(status_code=response.status_code, content=response.content)
+    except Exception:
+         return {"error": "Userbot API is strictly booting up. Give it a second!"}
 
-@app.get("/status")
-async def proxy_status():
+# Forward OpenAPI schema (Swagger UI needs this)
+@app.get("/openapi.json")
+async def proxy_openapi(request: Request):
+    headers = dict(request.headers)
+    headers.pop("host", None) 
     try:
-        async with httpx.AsyncClient(timeout=20) as client:
-            response = await client.get(
-                f"http://127.0.0.1:{USERBOT_API_PORT}/status"
-            )
+        async with httpx.AsyncClient() as client:
+            response = await client.get(f"http://127.0.0.1:{USERBOT_API_PORT}/openapi.json", headers=headers)
             return response.json()
     except Exception:
-        return {"status": "Userbot API offline"}
+         return {"error": "Userbot API is booting up..."}
+
+# Forward all /api/ traffic dynamically
+@app.route("/api/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
+async def proxy_to_userbot(request: Request, path: str):
+    url = f"http://127.0.0.1:{USERBOT_API_PORT}/api/{path}"
+    headers = dict(request.headers)
+    headers.pop("host", None) 
+    
+    try:
+        async with httpx.AsyncClient() as client:
+            route_method = getattr(client, request.method.lower())
+            body = await request.body()
+            response = await route_method(
+                url, headers=headers, content=body
+            )
+            return JSONResponse(status_code=response.status_code, content=response.json())
+    except Exception as e:
+        return JSONResponse(status_code=502, content={"error": f"Userbot API is offline or booting up. Exception: {str(e)}"})