Update app.py

app.py

@@ -1,36 +1,30 @@
 import os
 import subprocess
 import threading
-from fastapi import FastAPI
+from fastapi import FastAPI, Request
+from fastapi.responses import JSONResponse
+import httpx # pip install httpx
 
 app = FastAPI()
 
-GITHUB_USERNAME = os.getenv("GITHUB_USERNAME", "").strip()
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", "").strip()
-REPO_NAME = os.getenv("REPO_NAME", "").strip()
+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"):
-        if GITHUB_TOKEN:
-            repo_url = f"https://{GITHUB_USERNAME}:{GITHUB_TOKEN}@github.com/{GITHUB_USERNAME}/{REPO_NAME}.git"
-        else:
-            repo_url = f"https://github.com/{GITHUB_USERNAME}/{REPO_NAME}.git"
-
-        print(f"Cloning {GITHUB_USERNAME}/{REPO_NAME}...")
+        repo_url = f"https://{GITHUB_USERNAME}:{GITHUB_TOKEN}@github.com/{GITHUB_USERNAME}/{REPO_NAME}.git"
         subprocess.run(["git", "clone", repo_url, "repo"], check=True)
 
 def install_requirements():
-    req = "repo/requirements.txt"
-    if os.path.exists(req):
-        print("Installing requirements...")
-        subprocess.run(["pip", "install", "--no-cache-dir", "-r", req], check=True)
+    req_file = "repo/requirements.txt"
+    if os.path.exists(req_file):
+        subprocess.run(["pip", "install", "--no-cache-dir", "-r", req_file], check=True)
 
 def start_script():
-    if os.path.exists("repo/startup"):
-        print("Starting startup script...")
-        subprocess.Popen(["bash", "startup"], cwd="repo")
-    else:
-        print("startup script not found!")
+    subprocess.Popen(["bash", "startup"], cwd="repo")
 
 def run_app():
     clone_repo()
@@ -43,4 +37,36 @@ def startup_event():
 
 @app.get("/")
 def home():
-    return {"status": "repo running via startup script"}
+    return {"status": "Repo cloned, requirements installed, start script running 🚀"}
+
+# --- MAGIC PROXY ---
+# Forward all traffic starting with /api/ directly down to the Userbot on port 8888!
+@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}"
+    
+    # Extract headers and API Key
+    headers = dict(request.headers)
+    
+    # Strip the host header so it doesn't conflict
+    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)}"})
+
+@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 off"}