Update app.py

app.py

@@ -8,11 +8,14 @@ import re
 
 app = FastAPI()
 
-# Konfigurasi RSCaptcha
+# RSCaptcha API Endpoints
 RS_GET_URL = "https://rscaptcha.com/captcha/v5/get"
 RS_VERIFY_URL = "https://rscaptcha.com/captcha/v5/verify"
 
 def solve_distance(bg_b64, target_b64):
+    """
+    Logika AI untuk menghitung jarak geser menggunakan Canny Edge Detection
+    """
     # Decode Base64 ke OpenCV format
     bg_bytes = base64.b64decode(re.sub(r'^data:image/\w+;base64,', '', bg_b64))
     target_bytes = base64.b64decode(re.sub(r'^data:image/\w+;base64,', '', target_b64))
@@ -20,59 +23,67 @@ def solve_distance(bg_b64, target_b64):
     bg_img = cv2.imdecode(np.frombuffer(bg_bytes, np.uint8), cv2.IMREAD_COLOR)
     target_img = cv2.imdecode(np.frombuffer(target_bytes, np.uint8), cv2.IMREAD_COLOR)
     
-    # Preprocessing: Grayscale & Canny Edge Detection
+    # Preprocessing: Grayscale
     bg_gray = cv2.cvtColor(bg_img, cv2.COLOR_BGR2GRAY)
     target_gray = cv2.cvtColor(target_img, cv2.COLOR_BGR2GRAY)
     
-    # Gunakan Canny untuk akurasi gila
+    # Canny Edge Detection untuk akurasi tinggi pada puzzle
     bg_edge = cv2.Canny(bg_gray, 100, 200)
     target_edge = cv2.Canny(target_gray, 100, 200)
     
-    # Template Matching
+    # Template Matching pada hasil Edges
     res = cv2.matchTemplate(bg_edge, target_edge, cv2.TM_CCOEFF_NORMED)
     _, _, _, max_loc = cv2.minMaxLoc(res)
     
+    # Koordinat X (jarak geser) adalah max_loc[0]
     return float(max_loc[0])
 
+@app.get("/")
+async def root():
+    return {"status": "running", "message": "DAN AI Solver is Ready"}
+
 @app.post("/bypass")
-async def bypass(app_id: str, public_key: str):
+async def bypass(app_id: str, public_key: str, cookies: str = ""):
     async with httpx.AsyncClient(timeout=30.0) as client:
         try:
-            # 1. Ambil Gambar - Pastikan payload lengkap
-            # Kadang butuh rsc_v: 'v5' atau version: 'v5'
-            payload_get = {
-                'app_id': app_id, 
-                'public_key': public_key, 
-                'version': 'v5'
-            }
-            
+            # Headers wajib agar tidak dianggap bot oleh server RSCaptcha
             headers_rs = {
+                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
                 "Origin": "https://99faucet.com",
                 "Referer": "https://99faucet.com/",
+                "Cookie": cookies,  # Meneruskan cookie dari PHP
                 "Content-Type": "application/x-www-form-urlencoded"
             }
 
+            # LANGKAH 1: Ambil Gambar dari RSCaptcha
+            payload_get = {
+                'app_id': app_id, 
+                'public_key': public_key, 
+                'version': 'v5'
+            }
+            
             resp_get = await client.post(RS_GET_URL, data=payload_get, headers=headers_rs)
             data = resp_get.json()
             
-            # DEBUG: Jika gagal, kita beri tahu apa isi respon dari RSCaptcha
             if 'data' not in data or 'tile_image_base64' not in data['data']:
                 return {
                     "status": "error", 
-                    "message": "RSCaptcha tidak mengirim gambar",
-                    "debug_response": data 
+                    "message": "Gagal fetch puzzle (Cookie mungkin invalid atau IP diblokir)",
+                    "raw_response": data
                 }
 
             captcha_key = data['data']['captcha_key']
             display_y = data['data']['display_y']
-            bg_b64 = data['data']['master_image_base64']
-            target_b64 = data['data']['tile_image_base64']
+            master_img = data['data']['master_image_base64']
+            tile_img = data['data']['tile_image_base64']
             
-            # 2. Hitung Jarak
-            distance = solve_distance(bg_b64, target_b64)
+            # LANGKAH 2: Hitung Jarak Geser dengan OpenCV
+            distance = solve_distance(master_img, tile_img)
             
-            # 3. Verifikasi
+            # LANGKAH 3: Verifikasi Langsung ke RSCaptcha Server
+            # Format response: "x,y" (koordinat horizontal,koordinat vertikal)
             response_val = f"{distance},{display_y}"
+            
             verify_payload = {
                 'app_id': app_id,
                 'public_key': public_key,
@@ -84,17 +95,24 @@ async def bypass(app_id: str, public_key: str):
             resp_verify = await client.post(RS_VERIFY_URL, data=verify_payload, headers=headers_rs)
             v_data = resp_verify.json()
             
+            # LANGKAH 4: Kirim hasil final balik ke PHP
+            # Beberapa server RSCaptcha mengembalikan 'result' (token terenkripsi)
             if v_data.get('data') == 'ok' or 'result' in v_data:
                 return {
                     "status": "success",
                     "rscaptcha_token": captcha_key,
-                    "rscaptcha_response": v_data.get('result') or response_val
+                    "rscaptcha_response": v_data.get('result') or response_val,
+                    "distance": distance
                 }
             else:
-                return {"status": "fail", "details": v_data}
+                return {
+                    "status": "fail", 
+                    "message": "Verifikasi RSCaptcha ditolak",
+                    "details": v_data
+                }
 
         except Exception as e:
-            return {"status": "error", "message": str(e)}
+            return {"status": "error", "message": f"Server Error: {str(e)}"}
 
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)