feat: add TimeoutError

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ucaptcha"
-version = "1.1.1"
+version = "1.1.2"
 dependencies = ["httpx"]
 requires-python = ">=3"
 authors = [{ name = "Pradish Bijukchhe", email = "[email protected]" }]

ucaptcha/anticaptcha.py

@@ -5,6 +5,7 @@
 
 from ucaptcha import logger
 from ucaptcha.exceptions import KeyDoesNotExistError
+from ucaptcha.exceptions import TimeoutError
 from ucaptcha.exceptions import UCaptchaError
 from ucaptcha.exceptions import WrongUserKeyError
 from ucaptcha.exceptions import ZeroBalanceError
@@ -63,7 +64,7 @@ def solve_anticaptcha(
         raise UCaptchaError("Task ID not found in data.")
     task_id = data["taskId"]
 
-    while True:
+    for _ in range(10):
         data = {"clientKey": api_key, "taskId": task_id}
         request_url = f"https://api.anti-captcha.com/getTaskResult"
         res = httpx.post(request_url, json=data, timeout=300)
@@ -81,3 +82,4 @@ def solve_anticaptcha(
             return data["solution"].get("gRecaptchaResponse")
         time.sleep(10)
         continue
+    raise TimeoutError

ucaptcha/capmonster.py

@@ -5,6 +5,7 @@
 
 from ucaptcha import logger
 from ucaptcha.exceptions import KeyDoesNotExistError
+from ucaptcha.exceptions import TimeoutError
 from ucaptcha.exceptions import UCaptchaError
 from ucaptcha.exceptions import WrongUserKeyError
 from ucaptcha.exceptions import ZeroBalanceError
@@ -64,7 +65,7 @@ def solve_capmonster(
         raise UCaptchaError("Task ID not found.")
     task_id = data["taskId"]
 
-    while True:
+    for _ in range(10):
         data = {"clientKey": api_key, "taskId": task_id}
         request_url = f"https://api.capmonster.cloud/getTaskResult"
         res = httpx.post(request_url, json=data, timeout=300)
@@ -82,3 +83,4 @@ def solve_capmonster(
             return data["solution"].get("gRecaptchaResponse")
         time.sleep(10)
         continue
+    raise TimeoutError

ucaptcha/exceptions.py

@@ -16,3 +16,7 @@ class KeyDoesNotExistError(UCaptchaError):
 
 class ProxyFormatError(UCaptchaError):
     pass
+
+
+class TimeoutError(UCaptchaError):
+    pass

ucaptcha/nocaptchaai.py

@@ -5,6 +5,7 @@
 
 from ucaptcha import logger
 from ucaptcha.exceptions import KeyDoesNotExistError
+from ucaptcha.exceptions import TimeoutError
 from ucaptcha.exceptions import UCaptchaError
 from ucaptcha.exceptions import ZeroBalanceError
 from ucaptcha.proxies import get_proxy_parts
@@ -64,7 +65,7 @@ def solve_nocaptchaai(
     task_url = data["url"]
     time.sleep(7)
 
-    while True:
+    for _ in range(10):
         res = httpx.get(task_url, headers=headers, timeout=300)
         res.raise_for_status()
         data = res.json()
@@ -79,3 +80,4 @@ def solve_nocaptchaai(
             logger.info("Captcha ready.")
             return data["token"]
         time.sleep(10)
+    raise TimeoutError

ucaptcha/nopecha.py

@@ -4,6 +4,7 @@
 import httpx
 
 from ucaptcha import logger
+from ucaptcha.exceptions import TimeoutError
 from ucaptcha.exceptions import UCaptchaError
 from ucaptcha.proxies import get_proxy_parts
 
@@ -53,7 +54,7 @@ def solve_nopecha(
 
     task_url = f"https://api.nopecha.com/token/?key={api_key}&id={task_id}"
 
-    while True:
+    for _ in range(10):
         res = httpx.get(task_url, timeout=300)
         if res.status_code == 409:
             if "Incomplete job" in res.text:
@@ -68,3 +69,4 @@ def solve_nopecha(
             return data["data"]
 
         raise UCaptchaError(f"{res.status_code}, {res.text}")
+    raise TimeoutError

ucaptcha/solver.py

@@ -1,12 +1,11 @@
 from typing import Literal
 
+from ucaptcha.anticaptcha import solve_anticaptcha
+from ucaptcha.capmonster import solve_capmonster
+from ucaptcha.nocaptchaai import solve_nocaptchaai
 from ucaptcha.nopecha import solve_nopecha
 from ucaptcha.twocaptcha import solve_twocaptcha
 
-from .anticaptcha import solve_anticaptcha
-from .capmonster import solve_capmonster
-from .nocaptchaai import solve_nocaptchaai
-
 CaptchaService = Literal[
     "anti-captcha", "capmonster", "nocaptchaai", "nopecha", "twocaptcha"
 ]

ucaptcha/twocaptcha.py

@@ -4,6 +4,7 @@
 import httpx
 
 from ucaptcha import logger
+from ucaptcha.exceptions import TimeoutError
 from ucaptcha.exceptions import UCaptchaError
 from ucaptcha.proxies import get_proxy_parts
 
@@ -52,7 +53,7 @@ def solve_twocaptcha(
 
     time.sleep(7)
 
-    while True:
+    for _ in range(10):
         data = {"clientKey": api_key, "taskId": task_id}
         res = httpx.post(
             "https://api.2captcha.com/getTaskResult", json=data, timeout=30
@@ -67,3 +68,4 @@ def solve_twocaptcha(
             logger.info("Captcha ready.")
             return data["solution"]["token"]
         time.sleep(10)
+    raise TimeoutError