Update app.py

app.py

@@ -3,61 +3,65 @@ import cv2
 import numpy as np
 import httpx
 import uvicorn
-import re
 import base64
+import re
 
 app = FastAPI()
 
+# Konfigurasi RSCaptcha
 RS_GET_URL = "https://rscaptcha.com/captcha/v5/get"
 RS_VERIFY_URL = "https://rscaptcha.com/captcha/v5/verify"
 
-def solve_image(bg_b64, target_b64):
-    # Decode Base64 to OpenCV
+def solve_distance(bg_b64, target_b64):
+    # 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))
     
     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)
     
-    # Edge Detection Logic
+    # Preprocessing: Grayscale & Canny Edge Detection
     bg_gray = cv2.cvtColor(bg_img, cv2.COLOR_BGR2GRAY)
     target_gray = cv2.cvtColor(target_img, cv2.COLOR_BGR2GRAY)
     
-    res = cv2.matchTemplate(cv2.Canny(bg_gray, 100, 200), 
-                            cv2.Canny(target_gray, 100, 200), 
-                            cv2.TM_CCOEFF_NORMED)
+    # Gunakan Canny untuk akurasi gila
+    bg_edge = cv2.Canny(bg_gray, 100, 200)
+    target_edge = cv2.Canny(target_gray, 100, 200)
+    
+    # Template Matching
+    res = cv2.matchTemplate(bg_edge, target_edge, cv2.TM_CCOEFF_NORMED)
     _, _, _, max_loc = cv2.minMaxLoc(res)
+    
     return float(max_loc[0])
 
 @app.post("/bypass")
-async def bypass_rscaptcha(app_id: str, public_key: str):
+async def bypass(app_id: str, public_key: str):
     async with httpx.AsyncClient(timeout=30.0) as client:
         try:
-            # 1. Get Puzzle
-            get_res = await client.post(RS_GET_URL, data={
-                'app_id': app_id, 
-                'public_key': public_key, 
-                'version': 'v5'
-            })
-            data = get_res.json()
+            # 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)
+            data = resp_get.json()
             
+            if 'data' not in data:
+                return {"status": "error", "message": "Gagal ambil puzzle dari RSCaptcha"}
+
             captcha_key = data['data']['captcha_key']
             display_y = data['data']['display_y']
             
-            # 2. Solve Distance
-            distance = solve_image(data['data']['master_image_base64'], 
-                                   data['data']['tile_image_base64'])
+            # Langkah 2: Hitung Jarak Geser dengan AI
+            distance = solve_distance(data['data']['master_image_base64'], data['data']['tile_image_base64'])
             
-            # 3. Verify to RSCaptcha Server
-            # Kita kirim sebagai multipart/form-data
+            # Langkah 3: Verifikasi Langsung ke RSCaptcha
+            # Response format: "x,y"
             response_val = f"{distance},{display_y}"
             
-            files = {
-                'app_id': (None, app_id),
-                'public_key': (None, public_key),
-                'version': (None, 'v5'),
-                'token': (None, captcha_key),
-                'response': (None, response_val)
+            verify_payload = {
+                'app_id': app_id,
+                'public_key': public_key,
+                'version': 'v5',
+                'token': captcha_key,
+                'response': response_val
             }
             
             headers = {
@@ -65,18 +69,19 @@ async def bypass_rscaptcha(app_id: str, public_key: str):
                 "Referer": "https://99faucet.com/"
             }
             
-            verify_res = await client.post(RS_VERIFY_URL, data=files, headers=headers)
-            v_data = verify_res.json()
+            resp_verify = await client.post(RS_VERIFY_URL, data=verify_payload, headers=headers)
+            v_data = resp_verify.json()
             
+            # Langkah 4: Kembalikan hasil ke PHP
             if v_data.get('data') == 'ok':
                 return {
                     "status": "success",
                     "rscaptcha_token": captcha_key,
-                    "rscaptcha_response": v_data.get('result') or v_data['data'].get('rscaptcha_response') or response_val
+                    "rscaptcha_response": v_data.get('result') or v_data.get('data_response') or response_val
                 }
             else:
                 return {"status": "fail", "details": v_data}
-                
+
         except Exception as e:
             return {"status": "error", "message": str(e)}