Skip to content

Grk717/proxy refactor #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azeriker merged 2 commits into from
Apr 19, 2025
Merged

Grk717/proxy refactor #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b7bf74
proxy usage refactor
pavelgrinkevich Apr 14, 2025
ce51382
fix proxy example
pavelgrinkevich Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 34 additions & 41 deletions capmonstercloud_client/CapMonsterCloudClient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@


_instance_config = (
((RecaptchaV2ProxylessRequest, RecaptchaV2Request), getRecaptchaV2Timeouts),
((RecaptchaV2EnterpriseProxylessRequest, RecaptchaV2EnterpriseRequest), getRecaptchaV2EnterpriseTimeouts),
((RecaptchaV2Request,), getRecaptchaV2Timeouts),
((RecaptchaV2EnterpriseRequest,), getRecaptchaV2EnterpriseTimeouts),
((RecaptchaV3ProxylessRequest), getRecaptchaV3Timeouts),
((ImageToTextRequest), getImage2TextTimeouts),
((FuncaptchaProxylessRequest, FuncaptchaRequest), getFuncaptchaTimeouts),
((HcaptchaProxylessRequest, HcaptchaRequest), getHcaptchaTimeouts),
((GeetestProxylessRequest, GeetestRequest), getGeetestTimeouts),
((TurnstileProxylessRequest, TurnstileRequest), getTurnstileTimeouts),
((FuncaptchaRequest,), getFuncaptchaTimeouts),
((HcaptchaRequest,), getHcaptchaTimeouts),
((GeetestRequest,), getGeetestTimeouts),
((TurnstileRequest,), getTurnstileTimeouts),
((RecaptchaComplexImageTaskRequest, HcaptchaComplexImageTaskRequest,
FunCaptchaComplexImageTaskRequest), getImage2TextTimeouts),
((DataDomeCustomTaskRequest, DataDomeCustomTaskProxylessRequest), getDatadomeTimeouts),
((TenDiCustomTaskRequest, TenDiCustomTaskProxylessRequest), getTenDiTimeouts),
((BasiliskCustomTaskRequest, BasiliskCustomTaskProxylessRequest), getBasiliskTimeouts),
((AmazonWafRequest, AmazonWafProxylessRequest), getAmazonWafTimeouts),
((BinanceTaskRequest, BinanceTaskProxylessRequest), getBinanceTimeouts),
((ImpervaCustomTaskRequest, ImpervaCustomTaskProxylessRequest), getImpervaTimeouts),
((DataDomeCustomTaskRequest,), getDatadomeTimeouts),
((TenDiCustomTaskRequest,), getTenDiTimeouts),
((BasiliskCustomTaskRequest,), getBasiliskTimeouts),
((AmazonWafRequest,), getAmazonWafTimeouts),
((BinanceTaskRequest,), getBinanceTimeouts),
((ImpervaCustomTaskRequest,), getImpervaTimeouts),
((RecognitionComplexImageTaskRequest), getCITTimeouts)
)

Expand Down Expand Up @@ -61,29 +61,24 @@ async def get_balance(self) -> Dict[str, Union[int, float, str]]:
return result


async def solve_captcha(self, request: Union[RecaptchaV2EnterpriseProxylessRequest,
async def solve_captcha(self, request: Union[
RecaptchaV2EnterpriseRequest,
RecaptchaV2Request,
RecaptchaV2ProxylessRequest,
RecaptchaV3ProxylessRequest,
ImageToTextRequest,
FuncaptchaProxylessRequest,
FuncaptchaRequest,
HcaptchaRequest,
HcaptchaProxylessRequest,
GeetestProxylessRequest,
GeetestRequest,
TurnstileProxylessRequest,
TurnstileRequest,
HcaptchaComplexImageTaskRequest,
RecaptchaComplexImageTaskRequest,
ImageToTextRequest,
FuncaptchaRequest,
FunCaptchaComplexImageTaskRequest,
DataDomeCustomTaskProxylessRequest,
HcaptchaRequest,
HcaptchaComplexImageTaskRequest,
GeetestRequest,
DataDomeCustomTaskRequest,
TenDiCustomTaskRequest,
BasiliskCustomTaskRequest,
AmazonWafRequest,
BinanceTaskRequest,
BinanceTaskProxylessRequest,
ImpervaCustomTaskRequest,
ImpervaCustomTaskProxylessRequest,
TurnstileRequest,
RecognitionComplexImageTaskRequest],
) -> Dict[str, str]:
'''
Expand All @@ -99,27 +94,25 @@ async def solve_captcha(self, request: Union[RecaptchaV2EnterpriseProxylessReque
raise UnknownRequestInstanceError(f'Unknown request instance "{type(request)}", ' \
f'expected that request will belong next instances: {rs_all}')

async def _solve(self, request: Union[RecaptchaV2EnterpriseProxylessRequest,
async def _solve(self, request: Union[
RecaptchaV2EnterpriseRequest,
RecaptchaV2Request,
RecaptchaV2ProxylessRequest,
RecaptchaV3ProxylessRequest,
ImageToTextRequest,
FuncaptchaProxylessRequest,
FuncaptchaRequest,
HcaptchaRequest,
HcaptchaProxylessRequest,
GeetestProxylessRequest,
GeetestRequest,
TurnstileProxylessRequest,
TurnstileRequest,
HcaptchaComplexImageTaskRequest,
RecaptchaComplexImageTaskRequest,
ImageToTextRequest,
FuncaptchaRequest,
FunCaptchaComplexImageTaskRequest,
HcaptchaRequest,
HcaptchaComplexImageTaskRequest,
GeetestRequest,
DataDomeCustomTaskRequest,
TenDiCustomTaskRequest,
BasiliskCustomTaskRequest,
AmazonWafRequest,
BinanceTaskRequest,
BinanceTaskProxylessRequest,
ImpervaCustomTaskRequest,
ImpervaCustomTaskProxylessRequest],
TurnstileRequest,
RecognitionComplexImageTaskRequest],
timeouts: GetResultTimeouts,
) -> Dict[str, str]:

Expand Down
22 changes: 0 additions & 22 deletions capmonstercloud_client/requests/AmazonWafProxylessRequest.py
View file
Open in desktop

This file was deleted.

29 changes: 18 additions & 11 deletions capmonstercloud_client/requests/AmazonWafRequest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
from typing import Dict, Union
from pydantic import Field, validator
from typing import Dict, Union, Optional
from pydantic import Field

from .proxy_info import ProxyInfo
from .AmazonWafRequestBase import AmazonWafRequestBase
from .baseRequestWithProxy import BaseRequestWithProxy

class AmazonWafRequest(AmazonWafRequestBase, ProxyInfo):
class AmazonWafRequest(BaseRequestWithProxy):
type: str = 'AmazonTask'
websiteUrl: str
challengeScript: str
captchaScript: str
websiteKey: str
context: str
iv: str
cookieSolution: Optional[bool] = Field(default=None)

def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
task = {}
Expand All @@ -16,12 +22,13 @@ def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
task['websiteKey'] = self.websiteKey
task['context'] = self.context
task['iv'] = self.iv

task['proxyType'] = self.proxyType
task['proxyAddress'] = self.proxyAddress
task['proxyPort'] = self.proxyPort
task['proxyLogin'] = self.proxyLogin
task['proxyPassword'] = self.proxyPassword

if self.proxy:
task['proxyType'] = self.proxy.proxyType
task['proxyAddress'] = self.proxy.proxyAddress
task['proxyPort'] = self.proxy.proxyPort
task['proxyLogin'] = self.proxy.proxyLogin
task['proxyPassword'] = self.proxy.proxyPassword

if self.cookieSolution is not None:
task['cookieSolution'] = self.cookieSolution
Expand Down
13 changes: 0 additions & 13 deletions capmonstercloud_client/requests/AmazonWafRequestBase.py
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions capmonstercloud_client/requests/BasiliskCustomTaskProxylessRequest.py
View file
Open in desktop

This file was deleted.

20 changes: 11 additions & 9 deletions capmonstercloud_client/requests/BasiliskCustomTaskRequest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
from typing import Dict, Union
from pydantic import Field, validator
from pydantic import Field

from .proxy_info import ProxyInfo
from .BasiliskCustomTaskRequestBase import BasiliskCustomTaskRequestBase
from .CustomTaskRequestBase import CustomTaskRequestBase

class BasiliskCustomTaskRequest(BasiliskCustomTaskRequestBase, ProxyInfo):
class BasiliskCustomTaskRequest(CustomTaskRequestBase):
captchaClass: str = Field(default='Basilisk')
websiteKey: str = Field()

def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
task = {}
task['type'] = self.type
task['class'] = self.captchaClass
task['websiteURL'] = self.websiteUrl
task['websiteKey'] = self.websiteKey
task['proxyType'] = self.proxyType
task['proxyAddress'] = self.proxyAddress
task['proxyPort'] = self.proxyPort
task['proxyLogin'] = self.proxyLogin
task['proxyPassword'] = self.proxyPassword
if self.proxy:
task['proxyType'] = self.proxy.proxyType
task['proxyAddress'] = self.proxy.proxyAddress
task['proxyPort'] = self.proxy.proxyPort
task['proxyLogin'] = self.proxy.proxyLogin
task['proxyPassword'] = self.proxy.proxyPassword
if self.userAgent is not None:
task['userAgent'] = self.userAgent
return task
11 changes: 0 additions & 11 deletions capmonstercloud_client/requests/BasiliskCustomTaskRequestBase.py
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions capmonstercloud_client/requests/BinanceTaskProxylessRequest.py
View file
Open in desktop

This file was deleted.

29 changes: 18 additions & 11 deletions capmonstercloud_client/requests/BinanceTaskRequest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
from typing import Dict, Union
from pydantic import Field, validator
from typing import Dict, Union, Optional
from pydantic import Field

from .proxy_info import ProxyInfo
from .BinanceTaskRequestBase import BinanceTaskRequestBase
from .baseRequestWithProxy import BaseRequestWithProxy

class BinanceTaskRequest(BaseRequestWithProxy):
type: str = Field(default='BinanceTask')
websiteKey: str = Field()
websiteUrl: str = Field()
validateId: str = Field()
userAgent: Optional[str] = None

class BinanceTaskRequest(BinanceTaskRequestBase, ProxyInfo):

def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
task = {}
task['type'] = self.type
task['validateId'] = self.validateId
task['websiteURL'] = self.websiteUrl
task['websiteKey'] = self.websiteKey
task['proxyType'] = self.proxyType
task['proxyAddress'] = self.proxyAddress
task['proxyPort'] = self.proxyPort
task['proxyLogin'] = self.proxyLogin
task['proxyPassword'] = self.proxyPassword

if self.proxy:
task['proxyType'] = self.proxy.proxyType
task['proxyAddress'] = self.proxy.proxyAddress
task['proxyPort'] = self.proxy.proxyPort
task['proxyLogin'] = self.proxy.proxyLogin
task['proxyPassword'] = self.proxy.proxyPassword

if self.userAgent is not None:
task['userAgent'] = self.userAgent
return task
11 changes: 0 additions & 11 deletions capmonstercloud_client/requests/BinanceTaskRequestBase.py
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions capmonstercloud_client/requests/CustomTaskRequestBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Optional, List, Dict
from typing import Optional, List

from .baseRequest import BaseRequest
from .baseRequestWithProxy import BaseRequestWithProxy

class CustomTaskRequestBase(BaseRequest):
class CustomTaskRequestBase(BaseRequestWithProxy):
captchaClass: str # Class(subtype) of ComplexImageTask
type: str = "CustomTask" # Recognition task type
websiteUrl: str # Address of a webpage with captcha
Expand Down
36 changes: 0 additions & 36 deletions capmonstercloud_client/requests/DataDomeCustomTaskProxylessRequest.py
View file
Open in desktop

This file was deleted.

Loading
Loading