Update main.py

main.py

@@ -1,120 +1,107 @@
 # main.py
 from fastapi import FastAPI, Request, UploadFile
-from typing import Any, Dict
+from typing import Any, Dict, Tuple
 from datetime import datetime
-import json
+import json, os, asyncio
+import httpx  # pip install httpx
 
 app = FastAPI()
 
+GAS_WEBAPP_URL = os.getenv("GAS_WEBAPP_URL")
+
 def print_human_friendly(payload: Dict[str, Any]) -> None:
-    """
-    يطبع الريكوست بشكل مقروء لليوزر + إيموجيز
-    """
-    # ترتيب العرض
     order = [
-        ("client",       "👤 Client"),
-        ("source",       "🌐 Source"),
-        ("event_name",   "🎯 Event Name"),
-        ("event_id",     "🧾 Event ID"),
-        ("value",        "💰 Value"),
-        ("currency",     "💱 Currency"),
-        ("transaction_id","💳 Transaction ID"),
-        ("content_id",   "🆔 Content ID"),
-        ("content_type", "📦 Content Type"),
-        ("fbp",          "🅵 fbp"),
-        ("fbc",          "🅵 fbc"),
-        ("ttclid",       "🕸️ ttclid"),
-        ("ttp",          "🍪 ttp"),
-        ("scid",         "🟪 scid"),
-        ("x_email",      "📧 x_email (hashed)"),
-        ("x_phone",      "📱 x_phone (hashed)"),
-        ("x_fn",         "🧑 First Name"),
-        ("x_ln",         "🧑 Last Name"),
-        ("timestamp",    "⏱️ Timestamp"),
-        ("client_ua",    "🖥️ Client UA"),
+        ("client","👤 Client"),("source","🌐 Source"),("event_name","🎯 Event Name"),
+        ("event_id","🧾 Event ID"),("value","💰 Value"),("currency","💱 Currency"),
+        ("transaction_id","💳 Transaction ID"),("content_id","🆔 Content ID"),
+        ("content_type","📦 Content Type"),("fbp","🅵 fbp"),("fbc","🅵 fbc"),
+        ("ttclid","🕸️ ttclid"),("ttp","🍪 ttp"),("scid","🟪 scid"),
+        ("x_email","📧 x_email (hashed)"),("x_phone","📱 x_phone (hashed)"),
+        ("x_fn","🧑 First Name"),("x_ln","🧑 Last Name"),
+        ("timestamp","⏱️ Timestamp"),("client_ua","🖥️ Client UA"),
     ]
-
     print("\n" + "-"*18 + " 👀 Human-friendly view " + "-"*18)
-
-    # أطبع الحقول الأساسية
     label_pad = 20
     for key, label in order:
-        if key in payload and payload.get(key) not in (None, ""):
-            value = payload.get(key)
-            print(f"{label:<{label_pad}}: {value}")
-
-    # أطبع العناصر (contents) بشكل منسق
-    contents = payload.get("contents")
+        if isinstance(payload, dict) and key in payload and payload.get(key) not in (None, ""):
+            print(f"{label:<{label_pad}}: {payload.get(key)}")
+    contents = payload.get("contents") if isinstance(payload, dict) else None
     if isinstance(contents, list):
         print("\n🧺 Contents:")
         for idx, item in enumerate(contents, start=1):
             if isinstance(item, dict):
-                cid   = item.get("content_id", "-")
-                name  = item.get("content_name", "-")
-                price = item.get("price", "-")
-                qty   = item.get("quantity", "-")
+                cid=item.get("content_id","-"); name=item.get("content_name","-")
+                price=item.get("price","-"); qty=item.get("quantity","-")
                 print(f"  #{idx} • ID: {cid} | Name: {name} | Price: {price} | Qty: {qty}")
             else:
                 print(f"  #{idx} • {item}")
     elif contents is not None:
-        # في حالة جات سترنج JSON أو فورمات مختلف
         print("\n🧺 Contents (raw):")
         try:
-            parsed = contents if isinstance(contents, (dict, list)) else json.loads(str(contents))
+            parsed = contents if isinstance(contents,(dict,list)) else json.loads(str(contents))
             print(json.dumps(parsed, ensure_ascii=False, indent=2))
         except Exception:
             print(str(contents))
-
     print("-"*60 + "\n")
 
+async def post_to_gas_raw(raw_body: str, content_type: str) -> Tuple[int, str]:
+    """ يرسل البودي كما هو (RAW) إلى GAS بنفس نوع المحتوى """
+    if not GAS_WEBAPP_URL or GAS_WEBAPP_URL.startswith("YOUR_"):
+        return (0, "GAS_WEBAPP_URL is not configured")
+    headers = {"Content-Type": content_type or "application/json"}
+    timeout = httpx.Timeout(10.0, connect=5.0)
+    async with httpx.AsyncClient(timeout=timeout) as client:
+        for attempt in range(1, 3):
+            try:
+                r = await client.post(GAS_WEBAPP_URL, content=raw_body.encode("utf-8"), headers=headers)
+                return (r.status_code, r.text[:5000])
+            except Exception as e:
+                if attempt == 2:
+                    return (0, f"Error posting to GAS: {e}")
+                await asyncio.sleep(0.5)
 
 @app.post("/echo")
 async def echo(request: Request) -> Dict[str, Any]:
     body_bytes = await request.body()
     now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
-    # هيدر واضح + الوقت
     print("\n" + "="*30 + f" 🆕 NEW REQUEST ({now}) " + "="*30)
 
-    # طباعة البودي الخام (زي ما هي عندك)
-    print("\n📝 Request body:")
+    # اطبع البودي الخام كما هو
     raw_text = body_bytes.decode("utf-8", errors="ignore")
+    print("\n📝 Request body:")
     print(raw_text)
     print("="*98)
 
-    # محاولة تفكيك JSON أو فورم
+    # حاول نطبعه بشكل ودّي فقط لو JSON object (للعرض فقط، بدون تعديل البيانات)
     parsed: Any
     try:
         parsed = await request.json()
     except Exception:
         try:
-            form = await request.form()
-            parsed = {}
-            for k, v in form.items():
-                if isinstance(v, UploadFile):
-                    parsed[k] = {"filename": v.filename, "content_type": v.content_type}
-                else:
-                    parsed[k] = v
+            parsed = json.loads(raw_text)
         except Exception:
-            # محاولة أخيرة: لو body نص بس فيه JSON
-            try:
-                parsed = json.loads(raw_text)
-            except Exception:
-                parsed = raw_text
+            parsed = None
 
-    # ✅ الطباعة الإضافية “الودية للعين” (لا تستبدل طباعة الـ JSON)
     if isinstance(parsed, dict):
         print_human_friendly(parsed)
     else:
-        print("\n(ℹ️ Human-friendly view skipped: payload is not an object)\n")
+        print("\n(ℹ️ Human-friendly view skipped: payload is not a JSON object)\n")
+
+    # 🚀 ابعت للـ GAS كما هو (RAW) بنفس content-type اللي جه
+    ct = request.headers.get("content-type", "application/json")
+    gas_status, gas_body = await post_to_gas_raw(raw_text, ct)
+    print(f"📤 GAS post status: {gas_status}")
+    if gas_body:
+        print(f"🔎 GAS response: {gas_body[:1000]}")
 
     return {
-        "received": parsed,
+        "received": parsed if isinstance(parsed, dict) else raw_text,
+        "forwarded_to_gas": True,
+        "gas_status": gas_status,
         "info": {
             "method": request.method,
             "url": str(request.url),
             "headers": dict(request.headers),
         },
     }
-
-# تشغيل: uvicorn main:app --reload --host 0.0.0.0 --port 8000