Update app.py

app.py

@@ -3,11 +3,10 @@ from fastapi.middleware.cors import CORSMiddleware
 import httpx
 import json
 import random
-from typing import Dict, Any, Optional
+from typing import Dict, Any
 
 app = FastAPI(title="Vietcap Proxy for vnstock")
 
-# Thêm CORS middleware
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
@@ -16,9 +15,6 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-TARGET_BASE = "https://trading.vietcap.com.vn"
-
-# Danh sách User-Agent để rotation
 USER_AGENTS = [
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
     "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36",
@@ -27,81 +23,65 @@ USER_AGENTS = [
 ]
 
 def get_random_headers() -> Dict[str, str]:
-    """Tạo headers ngẫu nhiên để tránh bị phát hiện."""
     return {
         "accept": "application/json, text/plain, */*",
         "accept-language": "vi,en-US;q=0.9,en;q=0.8",
         "content-type": "application/json",
         "dnt": "1",
-        "origin": "https://trading.vietcap.com.vn",
-        "referer": "https://trading.vietcap.com.vn/price-board?filter-group=HOSE&filter-value=VN30&view-type=FLAT",
         "user-agent": random.choice(USER_AGENTS),
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-origin",
-        "sec-ch-ua": '"Not)A;Brand";v="8", "Chromium";v="138", "Google Chrome";v="138"',
-        "sec-ch-ua-mobile": "?0",
-        "sec-ch-ua-platform": '"Windows"',
         "connection": "keep-alive"
     }
 
 @app.get("/")
 async def root():
-    """Health check endpoint."""
-    return {"status": "Vietcap Proxy is running", "target": TARGET_BASE}
+    return {"status": "Vietcap Proxy is running"}
 
 @app.post("/proxy")
 async def universal_proxy(request: Request):
     """
-    Universal proxy endpoint tương thích với module api_client.
-    Nhận JSON payload với url, headers, method, payload.
+    Universal proxy endpoint tương thích hoàn toàn với send_request:
+    Nhận JSON payload với url, headers, method, payload, params.
     """
     try:
-        # Đọc request body
         body = await request.json()
-        
-        # Extract thông tin từ request
         target_url = body.get("url")
         method = body.get("method", "GET").upper()
-        payload = body.get("payload")
-        client_headers = body.get("headers", {})
-        
+        payload = body.get("payload", None)
+        headers = body.get("headers", {}) or {}
+        params = body.get("params", None)
+
         if not target_url:
             raise HTTPException(status_code=400, detail="Missing 'url' in request body")
         
-        # Tạo headers cho request đến target
+        # Xây dựng headers hợp lý
         proxy_headers = get_random_headers()
-        
-        # Merge với headers từ client (client headers có priority cao hơn)
-        proxy_headers.update(client_headers)
-        
-        # Chuẩn bị request content
-        request_content = None
-        if payload:
-            if isinstance(payload, str):
-                request_content = payload
-            else:
-                request_content = json.dumps(payload)
-        
-        # Gửi request
-        async with httpx.AsyncClient(timeout=30, follow_redirects=True) as client:
-            if method == "GET":
-                resp = await client.get(target_url, headers=proxy_headers)
-            elif method == "POST":
-                resp = await client.post(target_url, headers=proxy_headers, content=request_content)
-            else:
-                raise HTTPException(status_code=400, detail=f"Unsupported method: {method}")
-        
-        # Trả về response
+        proxy_headers.update(headers)
+
+        # Chuẩn bị các tham số cho httpx
+        request_kwargs = {
+            "url": target_url,
+            "headers": proxy_headers,
+            "timeout": 30,
+            "follow_redirects": True
+        }
+        if params:
+            request_kwargs["params"] = params
+        if method in ("POST", "PUT", "PATCH"):
+            if isinstance(payload, (dict, list)):
+                request_kwargs["content"] = json.dumps(payload)
+            elif payload is not None:
+                request_kwargs["content"] = payload
+
+        async with httpx.AsyncClient() as client:
+            resp = await client.request(method, **request_kwargs)
+
         response_headers = {k: v for k, v in resp.headers.items()
-                          if k.lower() not in ("content-encoding", "transfer-encoding", "content-length")}
-        
+                            if k.lower() not in ("content-encoding", "transfer-encoding", "content-length")}
         return Response(
             content=resp.content,
             status_code=resp.status_code,
             headers=response_headers
         )
-        
     except httpx.RequestError as exc:
         raise HTTPException(status_code=502, detail=f"Request failed: {str(exc)}")
     except json.JSONDecodeError:
@@ -109,25 +89,22 @@ async def universal_proxy(request: Request):
     except Exception as exc:
         raise HTTPException(status_code=500, detail=f"Internal error: {str(exc)}")
 
-@app.post("/vietcap/{path:path}")
+# (Optional) Backward compatibility endpoint cho các client cũ
+@app.api_route("/vietcap/{path:path}", methods=["GET", "POST", "PUT", "PATCH", "DELETE"])
 async def vietcap_proxy(path: str, request: Request):
-    """
-    Backward compatibility endpoint cho Vietcap API.
-    """
-    url = f"{TARGET_BASE}/{path}"
-    body = await request.body()
-    
+    url = f"https://trading.vietcap.com.vn/{path}"
+    method = request.method
     headers = get_random_headers()
-    
+    headers.update(request.headers)
+    body = await request.body()
     try:
         async with httpx.AsyncClient(timeout=30) as client:
-            resp = await client.post(url, headers=headers, content=body)
+            resp = await client.request(method, url, headers=headers, content=body)
     except httpx.RequestError as exc:
         raise HTTPException(status_code=502, detail=f"Không thể kết nối tới Vietcap: {exc}")
-    
     return Response(
         content=resp.content,
         status_code=resp.status_code,
         headers={k: v for k, v in resp.headers.items()
                  if k.lower() not in ("content-encoding", "transfer-encoding")}
-    )
+    )