Update main.py

main.py

@@ -1,73 +1,36 @@
 # app.py
 import os
+import sys
 import json
 import requests
-from fastapi import FastAPI, Request, HTTPException
-from starlette.concurrency import run_in_threadpool
-from playwright.sync_api import sync_playwright
+from fastapi import FastAPI, HTTPException, Request
 
-# ------------ إعدادات ثابتة/بيئة ------------
-ODOO_BASE = os.getenv("ODOO_BASE", "https://odoo.binrushd.care")
-ODOO_API  = f"{ODOO_BASE}/api/crm.lead"
-AUTH_URL = f"{ODOO_BASE}/api/auth/token"
-SESSION_AUTH_URL = f"{ODOO_BASE}/web/session/authenticate"
-
-CF_ID       = os.getenv("CF_ACCESS_CLIENT_ID", "0491b36d7dcabce5b04f1a53f347bb4e.access")
-CF_SECRET   = os.getenv("CF_ACCESS_CLIENT_SECRET", "22152cb41b62393e159daaff7dce433006c3744c5850e6adc15fa3544bb5eb09")
+BASE = os.getenv("ODOO_BASE", "https://odoo.binrushd.care")
+AUTH_URL = f"{BASE}/api/auth/token"
+SESSION_AUTH_URL = f"{BASE}/web/session/authenticate"
 
+# نفس متغيراتك بالضبط (تقدر تغيّرها من env)
+CF_ID     = os.getenv("CF_ACCESS_CLIENT_ID", "0491b36d7dcabce5b04f1a53f347bb4e.access")
+CF_SECRET = os.getenv("CF_ACCESS_CLIENT_SECRET", "22152cb41b62393e159daaff7dce433006c3744c5850e6adc15fa3544bb5eb09")
 LOGIN     = os.getenv("ODOO_LOGIN", "binrushd.automation@gmail.com")
 PASSWORD  = os.getenv("ODOO_PASSWORD", "BR2025")
 DB_NAME   = os.getenv("ODOO_DB", "BR_EMR_16.0_202401")
 
-USER_AGENT = os.getenv("USER_AGENT",
-                       "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
-                       "(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36")
-
-REQUEST_TIMEOUT = int(os.getenv("REQUEST_TIMEOUT", "15"))
-
-app = FastAPI(title="HF Proxy -> Odoo (with Cloudflare cookie bootstrap)")
-
-# ---------- Utilities ----------
+app = FastAPI(title="Run get_token_and_session on request")
 
-def _mask(s: str, keep: int = 6) -> str:
-    """أظهر أول/آخر أحرف قليلة للّوج فقط"""
-    if not s: return ""
-    if len(s) <= keep*2: return s
-    return f"{s[:keep]}…{s[-keep:]}"
-
-def _get_cloudflare_cookie_header_sync(base_url: str, wait_ms: int = 2000) -> str:
-    """
-    يفتح الصفحة الرئيسية بالدومين، ينفذ JS (Cloudflare challenge) ويجمع الكوكيز كـ Cookie header.
-    """
-    with sync_playwright() as p:
-        browser = p.chromium.launch(headless=True)
-        context = browser.new_context(user_agent=USER_AGENT, locale="en-US")
-        page = context.new_page()
-        page.goto(base_url, timeout=30000)
-        page.wait_for_timeout(wait_ms)
-        cookies = context.cookies()
-        browser.close()
-    if not cookies:
-        return ""
-    return "; ".join(f"{c['name']}={c['value']}" for c in cookies)
-
-def _get_token_and_session() -> tuple[str, str]:
-    """
-    يستخرج access_token + session_id في كل مرة:
-      1) GET /api/auth/token مع CF-Access + (login/password/db) كهيدرز
-      2) لو session_id غير موجود: POST /web/session/authenticate (JSON-RPC)
-    """
+def get_token_and_session():
     s = requests.Session()
     s.headers.update({
         "Accept": "*/*",
         "Content-Type": "application/json",
-        "Accept-Encoding": "gzip, deflate",  # بدون br
+        # مهم: بدون br لتفادي brotli
+        "Accept-Encoding": "gzip, deflate",
         "Connection": "keep-alive",
         "CF-Access-Client-Id": CF_ID,
         "CF-Access-Client-Secret": CF_SECRET,
     })
 
-    # (1) token
+    # (1) الحصول على access_token (الهيدرز زي ما في سكريبتك)
     auth_headers = {
         "CF-Access-Client-Id": CF_ID,
         "CF-Access-Client-Secret": CF_SECRET,
@@ -77,14 +40,17 @@ def _get_token_and_session() -> tuple[str, str]:
     }
     r = s.get(AUTH_URL, headers=auth_headers, timeout=(5, 30))
     r.raise_for_status()
+    try:
+        data = r.json()
+    except ValueError:
+        # اطبع أول جزء من البودي للتشخيص
+        raise RuntimeError(f"Non-JSON from auth endpoint: {r.text[:300]}")
 
-    # Cloudflare غالبًا يرجّع JSON؛ requests يفك gzip تلقائيًا
-    data = r.json()
     token = data.get("access_token") or (data.get("data") or {}).get("access_token")
     if not token:
         raise RuntimeError(f"No access_token in response: {data}")
 
-    # (2) session_id
+    # (2) session_id من الكوكيز، أو نعمل authenticate
     session_id = s.cookies.get("session_id") or r.cookies.get("session_id")
     if not session_id:
         payload = {
@@ -97,88 +63,30 @@ def _get_token_and_session() -> tuple[str, str]:
         if not session_id:
             raise RuntimeError("Could not obtain session_id cookie.")
 
-    # اطبع للّوج (مخفّض)
-    print(f"[AUTH] token={_mask(token)}  session_id={_mask(session_id)}")
-    return token, session_id
-
-# ---------- Endpoints ----------
-
-@app.get("/health")
-def health():
-    return {"ok": True, "note": "ready to bootstrap cookies and forward requests"}
-
-@app.get("/ping")
-def ping():
-    return {"pong": True}
+    # ا��باعهُم في اللوج
+    print("ACCESS_TOKEN:", token)
+    print("SESSION_ID:", session_id)
 
-@app.post("/forward")
-async def forward_lead(request: Request):
-    """
-    - يستقبل JSON payload
-    - يستخرج access_token + session_id في نفس اللحظة ويطبعهما في اللوج
-    - يأخذ كوكيز Cloudflare بـ Playwright
-    - يرسل الطلب إلى Odoo مع كل الهيدرز/الكوكيز المطلوبة
-    """
-    # 0) payload
-    try:
-        payload = await request.json()
-    except Exception:
-        body_text = await request.body()
-        try:
-            payload = json.loads(body_text.decode("utf-8") or "{}")
-        except Exception:
-            payload = {}
-    # Debug (اختياري)
-    print(f"[FORWARD] incoming payload keys={list(payload.keys())}")
+    return token, session_id
 
-    # 1) token + session_id
+@app.get("/run")
+def run_get_token_and_session_get():
     try:
-        access_token, session_id = await run_in_threadpool(_get_token_and_session)
+        token, session_id = get_token_and_session()
+        return {"ok": True, "access_token": token, "session_id": session_id}
     except Exception as e:
-        raise HTTPException(status_code=502, detail=f"Auth failure: {str(e)}")
+        # رجّع 502 عشان تبان مشكلة خارجية بوضوح
+        raise HTTPException(status_code=502, detail=str(e))
 
-    # 2) Cloudflare cookies via Playwright
+@app.post("/run")
+async def run_get_token_and_session_post(_req: Request):
+    # نفس السلوك للـ POST
     try:
-        cookie_header = await run_in_threadpool(_get_cloudflare_cookie_header_sync, ODOO_BASE, 2000)
+        token, session_id = get_token_and_session()
+        return {"ok": True, "access_token": token, "session_id": session_id}
     except Exception as e:
-        cookie_header = ""
-        print("Playwright error (continue without cookies):", str(e))
+        raise HTTPException(status_code=502, detail=str(e))
 
-    # 3) headers
-    headers = {
-        "Accept": "application/json",
-        "Content-Type": "application/json",
-        "User-Agent": USER_AGENT,
-        "Accept-Encoding": "gzip, deflate",
-        "Connection": "keep-alive",
-        "CF-Access-Client-Id": CF_ID,
-        "CF-Access-Client-Secret": CF_SECRET,
-        "access-token": access_token,
-    }
-    cookie_list = []
-    if cookie_header:
-        cookie_list.append(cookie_header)
-    if session_id:
-        cookie_list.append(f"session_id={session_id}")
-    if cookie_list:
-        headers["Cookie"] = "; ".join(cookie_list)
-
-    # 4) POST -> Odoo
-    try:
-        resp = requests.post(ODOO_API, headers=headers, json=payload,
-                             timeout=REQUEST_TIMEOUT, allow_redirects=False)
-    except requests.RequestException as e:
-        raise HTTPException(status_code=502, detail=f"Error connecting to Odoo: {str(e)}")
-
-    status = resp.status_code
-    ctype = resp.headers.get("Content-Type", "")
-    # اطبع ملخص
-    print(f"[FORWARD] Odoo status={status} content-type={ctype}")
-
-    if "application/json" in ctype:
-        try:
-            return resp.json()
-        except Exception:
-            return {"status": status, "body": resp.text}
-    else:
-        return {"status": status, "body": resp.text}
+@app.get("/ping")
+def ping():
+    return {"pong": True}