0.9

.github/workflows/test.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - '.github/workflows/test.yml'
       - 'src/**'
+      - 'tests/**'
       - 'Makefile'
       - 'requirements.test.txt'
   pull_request:
@@ -26,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.11", ]
 
     steps:
       - uses: actions/checkout@v3

Makefile

@@ -28,10 +28,10 @@ upload:
 
 tests: install
 	coverage run --rcfile=.coveragerc -m pytest -vv --showlocals --pastebin=all \
-	tests && \
+	tests/ && \
 	coverage report --precision=3 --sort=cover --skip-empty --show-missing && \
-	coverage html --precision=3 --skip-empty -d coverage/html/ && \
-	coverage xml -o coverage/coverage.xml
+	coverage html --precision=3 --skip-empty -d src/coverage/html/ && \
+	coverage xml -o src/coverage/coverage.xml
 
 doc: install
 	cd docs/ && \

docs/conf.py

@@ -6,6 +6,8 @@
 from python3_capsolver import (
     core,
     akamai,
+    binance,
+    imperva,
     gee_test,
     hcaptcha,
     recaptcha,

docs/index.rst

@@ -33,6 +33,8 @@ The library is intended for software developers and is used to work with the `Ca
    modules/aws-waf/example.rst
    modules/cyber-si-ara/example.rst
    modules/akamai/example.rst
+   modules/imperva/example.rst
+   modules/binance/example.rst
 
 .. toctree::
    :maxdepth: 2

docs/modules/binance/example.rst

@@ -0,0 +1,12 @@
+Binance
+=======
+
+To import this module:
+
+.. code-block:: python
+
+    from python3_capsolver.binance import Binance
+
+
+.. autoclass:: python3_capsolver.binance.Binance
+    :members:

docs/modules/enum/info.rst

@@ -71,3 +71,15 @@ To import this module:
 .. autoclass:: python3_capsolver.core.enum.ImageToTextTaskTypeEnm
     :members:
     :undoc-members:
+
+.. autoclass:: python3_capsolver.core.enum.AntiAkamaiTaskEnm
+    :members:
+    :undoc-members:
+
+.. autoclass:: python3_capsolver.core.enum.AntiImpervaTaskEnm
+    :members:
+    :undoc-members:
+
+.. autoclass:: python3_capsolver.core.enum.BinanceCaptchaTaskEnm
+    :members:
+    :undoc-members:

docs/modules/imperva/example.rst

@@ -0,0 +1,12 @@
+Imperva
+=======
+
+To import this module:
+
+.. code-block:: python
+
+    from python3_capsolver.imperva import Imperva
+
+
+.. autoclass:: python3_capsolver.imperva.Imperva
+    :members:

docs/modules/serializer/info.rst

@@ -28,5 +28,13 @@ To import this module:
     :undoc-members:
 
 .. autopydantic_model:: python3_capsolver.core.serializer.AntiAkamaiWebTaskSer
+    :members:
+    :undoc-members:
+
+.. autopydantic_model:: python3_capsolver.core.serializer.AntiImpervaTaskSer
+    :members:
+    :undoc-members:
+
+.. autopydantic_model:: python3_capsolver.core.serializer.BinanceCaptchaTaskSer
     :members:
     :undoc-members:

src/python3_capsolver/__version__.py

@@ -1 +1 @@
-__version__ = "0.8"
+__version__ = "0.9"

src/python3_capsolver/binance.py

@@ -0,0 +1,112 @@
+from typing import Union
+
+from python3_capsolver.core.base import BaseCaptcha
+from python3_capsolver.core.enum import BinanceCaptchaTaskEnm
+from python3_capsolver.core.serializer import CaptchaResponseSer, BinanceCaptchaTaskSer
+
+
+class Binance(BaseCaptcha):
+    """
+    The class is used to work with Capsolver Imperva method.
+
+    Args:
+        api_key: Capsolver API key
+        captcha_type: Captcha type name, like ``AntiImpervaTask`` and etc.
+        websiteUrl: The website url
+        userAgent: Browser userAgent
+
+    Examples:
+        >>> Binance(api_key="CAI-BA9XXXXXXXXXXXXX2702E010",
+        ...          captcha_type="BinanceCaptchaTask",
+        ...          websiteURL="https://www.milanuncios.com/",
+        ...          websiteKey="login",
+        ...          validateId="3621a4fef82f4ab4a00e8b07465761c5",
+        ...         ).captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+        >>> Binance(api_key="CAI-BA9XXXXXXXXXXXXX2702E010",
+        ...          captcha_type=BinanceCaptchaTaskEnm.BinanceCaptchaTask,
+        ...          websiteURL="https://www.milanuncios.com/",
+        ...          websiteKey="login",
+        ...          validateId="3621a4fef82f4ab4a00e8b07465761c5",
+        ...         ).captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+        >>> await Binance(api_key="CAI-BA9650D2B9C2786B21120D512702E010",
+        ...                 captcha_type=BinanceCaptchaTaskEnm.BinanceCaptchaTask,
+        ...                 websiteURL="https://www.milanuncios.com/",
+        ...                 websiteKey="login",
+        ...                 validateId="3621a4fef82f4ab4a00e8b07465761c5",
+        ...         ).aio_captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+    Returns:
+        CaptchaResponseSer model with full server response
+
+    Notes:
+        https://docs.capsolver.com/guide/captcha/BnCaptcha.html
+    """
+
+    def __init__(
+        self,
+        captcha_type: Union[BinanceCaptchaTaskEnm, str],
+        websiteURL: str,
+        validateId: str,
+        websiteKey: str = "login",
+        *args,
+        **kwargs,
+    ):
+        super().__init__(*args, **kwargs)
+
+        if captcha_type == BinanceCaptchaTaskEnm.BinanceCaptchaTask:
+            self.task_params = BinanceCaptchaTaskSer(**locals()).dict()
+        else:
+            raise ValueError(
+                f"""Invalid `captcha_type` parameter set for `{self.__class__.__name__}`,
+                available - {BinanceCaptchaTaskEnm.list_values()}"""
+            )
+
+        for key in kwargs:
+            self.task_params.update({key: kwargs[key]})
+
+    def captcha_handler(self) -> CaptchaResponseSer:
+        """
+        Sync solving method
+
+        Returns:
+            CaptchaResponseSer model with full service response
+
+        Notes:
+            Check class docstring for more info
+        """
+        return self._processing_captcha(create_params=self.task_params)
+
+    async def aio_captcha_handler(self) -> CaptchaResponseSer:
+        """
+        Async method for captcha solving
+
+        Returns:
+            CaptchaResponseSer model with full service response
+
+        Notes:
+            Check class docstring for more info
+        """
+        return await self._aio_processing_captcha(create_params=self.task_params)

src/python3_capsolver/cloudflare.py

@@ -1,4 +1,4 @@
-from typing import Dict, Union, Optional
+from typing import Union, Optional
 
 from python3_capsolver.core.base import BaseCaptcha
 from python3_capsolver.core.enum import CloudflareTypeEnm
@@ -22,46 +22,42 @@ class Cloudflare(BaseCaptcha):
         >>> Cloudflare(api_key="CAI-1324...",
         ...             captcha_type=CloudflareTypeEnm.AntiCloudflareTask,
         ...             websiteURL="https://bck.websiteurl.com/registry",
-        ...             websiteKey='4ac25d',
-        ...             proxy="socks5:158.120.100.23:334:user:pass",
-        ...             metadata={'type': 'turnstile', 'acton':'login', 'cdata': '0000-1111-2222-3333-example-cdata'}
+        ...             websiteKey='0x4AAAAAAABS7vwvV6VFfMcD',
+        ...             proxy="socks5:158.120.100.23:334:user:pass"
         ...          ).captcha_handler()
         CaptchaResponseSer(errorId=0,
                            errorCode=None,
                            errorDescription=None,
                            taskId='73bdcd28-6c77-4414-8....',
                            status=<ResponseStatusEnm.Ready: 'ready'>,
-                           solution={'gRecaptchaResponse': '44795sds...'}
+                           solution={'token': '44795sds...'}
                           )
 
         >>> Cloudflare(api_key="CAI-1324...",
         ...             captcha_type=CloudflareTypeEnm.AntiCloudflareTask,
         ...             websiteURL="https://bck.websiteurl.com/registry",
-        ...             proxy="socks5:158.120.100.23:334:user:pass",
-        ...             metadata={'type': 'challenge'}
-        ...             html="<your challenge html source code>",
+        ...             proxy="socks5:158.120.100.23:334:user:pass"
         ...          ).captcha_handler()
         CaptchaResponseSer(errorId=0,
                            errorCode=None,
                            errorDescription=None,
                            taskId='73bdcd28-6c77-4414-8....',
                            status=<ResponseStatusEnm.Ready: 'ready'>,
-                           solution={'gRecaptchaResponse': '44795sds...'}
+                           solution={'token': '44795sds...'}
                           )
 
         >>> await Cloudflare(api_key="CAI-1324...",
         ...             captcha_type=CloudflareTypeEnm.AntiCloudflareTask,
         ...             websiteURL="https://bck.websiteurl.com/registry",
-        ...             websiteKey='4ac25d',
-        ...             proxy="socks5:158.120.100.23:334:user:pass",
-        ...             metadata={'type': 'challenge', 'acton':'login', 'cdata': '0000-1111-2222-3333-example-cdata'}
+        ...             websiteKey='0x4AAAAAAABS7vwvV6VFfMcD',
+        ...             proxy="socks5:158.120.100.23:334:user:pass"
         ...          ).aio_captcha_handler()
         CaptchaResponseSer(errorId=0,
                            errorCode=None,
                            errorDescription=None,
                            taskId='73bdcd28-6c77-4414-8....',
                            status=<ResponseStatusEnm.Ready: 'ready'>,
-                           solution={'gRecaptchaResponse': '44795sds...'}
+                           solution={'token': '44795sds...'}
                           )
 
     Returns:
@@ -76,9 +72,7 @@ def __init__(
         self,
         captcha_type: Union[CloudflareTypeEnm, str],
         websiteURL: str,
-        metadata: Dict[str, str],
         websiteKey: Optional[str] = None,
-        html: Optional[str] = None,
         *args,
         **kwargs,
     ):

src/python3_capsolver/core/enum.py

@@ -21,7 +21,7 @@
         """
         The name of the Enum member
         """
         return self._name_
 
     @DynamicClassAttribute
     def value(self) -> str:
@@ -39,8 +39,8 @@
     GET_BALANCE = "getBalance"
     CREATE_TASK = "createTask"
     GET_TASK_RESULT = "getTaskResult"
-    AKAMAI_BMP_INVOKE = "/akamaibmp/invoke"
-    AKAMAI_WEB_INVOKE = "/akamaiweb/invoke"
+    AKAMAI_BMP_INVOKE = "akamaibmp/invoke"
+    AKAMAI_WEB_INVOKE = "akamaiweb/invoke"
 
 
 class ImageToTextTaskTypeEnm(str, MyEnum):
@@ -117,6 +117,14 @@
     AntiAkamaiWebTask = "AntiAkamaiWebTask"
 
 
+class AntiImpervaTaskEnm(str, MyEnum):
+    AntiImpervaTask = "AntiImpervaTask"
+
+
+class BinanceCaptchaTaskEnm(str, MyEnum):
+    BinanceCaptchaTask = "BinanceCaptchaTask"
+
+
 class ResponseStatusEnm(str, MyEnum):
     """
     Enum store results `status` field variants

src/python3_capsolver/core/serializer.py

@@ -121,10 +121,7 @@ class DatadomeSliderSer(TaskSer):
 
 
 class CloudflareTurnstileSer(WebsiteDataOptionsSer):
-    metadata: dict = Field(..., description="Extra data")
-    html: Optional[str] = Field(
-        None, description="You can pass in the entire html source code for the challenge directly."
-    )
+    ...
 
 
 class CyberSiAraSer(WebsiteDataOptionsSer):
@@ -134,11 +131,26 @@ class CyberSiAraSer(WebsiteDataOptionsSer):
     UserAgent: str = Field(..., description="Browser userAgent, you need submit your userAgent")
 
 
-class AntiAkamaiBMPTaskSer(BaseModel):
+class AntiAkamaiBMPTaskSer(TaskSer):
     packageName: str = Field("de.zalando.iphone", description="Package name of AkamaiBMP mobile APP")
     version: str = Field("3.2.6", description="AKAMAI BMP Version number")
     country: str = Field("US", description="AKAMAI BMP country")
 
 
-class AntiAkamaiWebTaskSer(BaseModel):
+class AntiAkamaiWebTaskSer(TaskSer):
     url: str = Field(..., description="Browser url address")
+
+
+class AntiImpervaTaskSer(TaskSer):
+    websiteUrl: str = Field(..., description="The website url")
+    userAgent: str = Field(..., description="Browser userAgent")
+    utmvc: bool = Field(
+        True, description="If cookie contains `incap_see_xxx`, `nlbi_xxx`, `visid_inap_xxx`, mean is true"
+    )
+    reese84: bool = Field(True, description="if cookie conains `reese84`, set it true")
+
+
+class BinanceCaptchaTaskSer(TaskSer):
+    websiteURL: str = Field(..., description="Address of a webpage with Binance captcha")
+    websiteKey: str = Field("login", description="`bizId` always be `login`")
+    validateId: str = Field(..., description="`validateId` bncaptcha validateId field")