feat: adding geoip parameter to the StealthyFetcher
This commit is contained in:
@@ -269,6 +269,7 @@ True
|
|||||||
| addons | List of Firefox addons to use. **Must be paths to extracted addons.** | ✔️ |
|
| addons | List of Firefox addons to use. **Must be paths to extracted addons.** | ✔️ |
|
||||||
| humanize | Humanize the cursor movement. Takes either True or the MAX duration in seconds of the cursor movement. The cursor typically takes up to 1.5 seconds to move across the window. | ✔️ |
|
| humanize | Humanize the cursor movement. Takes either True or the MAX duration in seconds of the cursor movement. The cursor typically takes up to 1.5 seconds to move across the window. | ✔️ |
|
||||||
| allow_webgl | Enabled by default. Disabling it WebGL not recommended as many WAFs now checks if WebGL is enabled. | ✔️ |
|
| allow_webgl | Enabled by default. Disabling it WebGL not recommended as many WAFs now checks if WebGL is enabled. | ✔️ |
|
||||||
|
| geoip | Recommended to use with proxies; Automatically use IP's longitude, latitude, timezone, country, locale, & spoof the WebRTC IP address. It will also calculate and spoof the browser's language based on the distribution of language speakers in the target region. | ✔️ |
|
||||||
| disable_ads | Enabled by default, this installs `uBlock Origin` addon on the browser if enabled. | ✔️ |
|
| disable_ads | Enabled by default, this installs `uBlock Origin` addon on the browser if enabled. | ✔️ |
|
||||||
| network_idle | Wait for the page until there are no network connections for at least 500 ms. | ✔️ |
|
| network_idle | Wait for the page until there are no network connections for at least 500 ms. | ✔️ |
|
||||||
| timeout | The timeout in milliseconds that is used in all operations and waits through the page. The default is 30000. | ✔️ |
|
| timeout | The timeout in milliseconds that is used in all operations and waits through the page. The default is 30000. | ✔️ |
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class CamoufoxEngine:
|
|||||||
timeout: Optional[float] = 30000, page_action: Callable = do_nothing, wait_selector: Optional[str] = None, addons: Optional[List[str]] = None,
|
timeout: Optional[float] = 30000, page_action: Callable = do_nothing, wait_selector: Optional[str] = None, addons: Optional[List[str]] = None,
|
||||||
wait_selector_state: str = 'attached', google_search: Optional[bool] = True, extra_headers: Optional[Dict[str, str]] = None,
|
wait_selector_state: str = 'attached', google_search: Optional[bool] = True, extra_headers: Optional[Dict[str, str]] = None,
|
||||||
proxy: Optional[Union[str, Dict[str, str]]] = None, os_randomize: Optional[bool] = None, disable_ads: Optional[bool] = True,
|
proxy: Optional[Union[str, Dict[str, str]]] = None, os_randomize: Optional[bool] = None, disable_ads: Optional[bool] = True,
|
||||||
|
geoip: Optional[bool] = False,
|
||||||
adaptor_arguments: Dict = None,
|
adaptor_arguments: Dict = None,
|
||||||
):
|
):
|
||||||
"""An engine that utilizes Camoufox library, check the `StealthyFetcher` class for more documentation.
|
"""An engine that utilizes Camoufox library, check the `StealthyFetcher` class for more documentation.
|
||||||
@@ -38,6 +39,8 @@ class CamoufoxEngine:
|
|||||||
:param timeout: The timeout in milliseconds that is used in all operations and waits through the page. The default is 30000
|
:param timeout: The timeout in milliseconds that is used in all operations and waits through the page. The default is 30000
|
||||||
:param page_action: Added for automation. A function that takes the `page` object, does the automation you need, then returns `page` again.
|
:param page_action: Added for automation. A function that takes the `page` object, does the automation you need, then returns `page` again.
|
||||||
:param wait_selector: Wait for a specific css selector to be in a specific state.
|
:param wait_selector: Wait for a specific css selector to be in a specific state.
|
||||||
|
:param geoip: Recommended to use with proxies; Automatically use IP's longitude, latitude, timezone, country, locale, & spoof the WebRTC IP address.
|
||||||
|
It will also calculate and spoof the browser's language based on the distribution of language speakers in the target region.
|
||||||
:param wait_selector_state: The state to wait for the selector given with `wait_selector`. Default state is `attached`.
|
:param wait_selector_state: The state to wait for the selector given with `wait_selector`. Default state is `attached`.
|
||||||
:param google_search: Enabled by default, Scrapling will set the referer header to be as if this request came from a Google search for this website's domain name.
|
:param google_search: Enabled by default, Scrapling will set the referer header to be as if this request came from a Google search for this website's domain name.
|
||||||
:param extra_headers: A dictionary of extra headers to add to the request. _The referer set by the `google_search` argument takes priority over the referer set here if used together._
|
:param extra_headers: A dictionary of extra headers to add to the request. _The referer set by the `google_search` argument takes priority over the referer set here if used together._
|
||||||
@@ -53,6 +56,7 @@ class CamoufoxEngine:
|
|||||||
self.google_search = bool(google_search)
|
self.google_search = bool(google_search)
|
||||||
self.os_randomize = bool(os_randomize)
|
self.os_randomize = bool(os_randomize)
|
||||||
self.disable_ads = bool(disable_ads)
|
self.disable_ads = bool(disable_ads)
|
||||||
|
self.geoip = bool(geoip)
|
||||||
self.extra_headers = extra_headers or {}
|
self.extra_headers = extra_headers or {}
|
||||||
self.proxy = construct_proxy_dict(proxy)
|
self.proxy = construct_proxy_dict(proxy)
|
||||||
self.addons = addons or []
|
self.addons = addons or []
|
||||||
@@ -76,6 +80,7 @@ class CamoufoxEngine:
|
|||||||
"""
|
"""
|
||||||
addons = [] if self.disable_ads else [DefaultAddons.UBO]
|
addons = [] if self.disable_ads else [DefaultAddons.UBO]
|
||||||
with Camoufox(
|
with Camoufox(
|
||||||
|
geoip=self.geoip,
|
||||||
proxy=self.proxy,
|
proxy=self.proxy,
|
||||||
addons=self.addons,
|
addons=self.addons,
|
||||||
exclude_addons=addons,
|
exclude_addons=addons,
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ class StealthyFetcher(BaseFetcher):
|
|||||||
block_webrtc: Optional[bool] = False, allow_webgl: Optional[bool] = True, network_idle: Optional[bool] = False, addons: Optional[List[str]] = None,
|
block_webrtc: Optional[bool] = False, allow_webgl: Optional[bool] = True, network_idle: Optional[bool] = False, addons: Optional[List[str]] = None,
|
||||||
timeout: Optional[float] = 30000, page_action: Callable = do_nothing, wait_selector: Optional[str] = None, humanize: Optional[Union[bool, float]] = True,
|
timeout: Optional[float] = 30000, page_action: Callable = do_nothing, wait_selector: Optional[str] = None, humanize: Optional[Union[bool, float]] = True,
|
||||||
wait_selector_state: str = 'attached', google_search: Optional[bool] = True, extra_headers: Optional[Dict[str, str]] = None, proxy: Optional[Union[str, Dict[str, str]]] = None,
|
wait_selector_state: str = 'attached', google_search: Optional[bool] = True, extra_headers: Optional[Dict[str, str]] = None, proxy: Optional[Union[str, Dict[str, str]]] = None,
|
||||||
os_randomize: Optional[bool] = None, disable_ads: Optional[bool] = True,
|
os_randomize: Optional[bool] = None, disable_ads: Optional[bool] = True, geoip: Optional[bool] = False,
|
||||||
) -> Response:
|
) -> Response:
|
||||||
"""
|
"""
|
||||||
Opens up a browser and do your request based on your chosen options below.
|
Opens up a browser and do your request based on your chosen options below.
|
||||||
@@ -100,6 +100,8 @@ class StealthyFetcher(BaseFetcher):
|
|||||||
:param disable_ads: Enabled by default, this installs `uBlock Origin` addon on the browser if enabled.
|
:param disable_ads: Enabled by default, this installs `uBlock Origin` addon on the browser if enabled.
|
||||||
:param humanize: Humanize the cursor movement. Takes either True or the MAX duration in seconds of the cursor movement. The cursor typically takes up to 1.5 seconds to move across the window.
|
:param humanize: Humanize the cursor movement. Takes either True or the MAX duration in seconds of the cursor movement. The cursor typically takes up to 1.5 seconds to move across the window.
|
||||||
:param allow_webgl: Enabled by default. Disabling it WebGL not recommended as many WAFs now checks if WebGL is enabled.
|
:param allow_webgl: Enabled by default. Disabling it WebGL not recommended as many WAFs now checks if WebGL is enabled.
|
||||||
|
:param geoip: Recommended to use with proxies; Automatically use IP's longitude, latitude, timezone, country, locale, & spoof the WebRTC IP address.
|
||||||
|
It will also calculate and spoof the browser's language based on the distribution of language speakers in the target region.
|
||||||
:param network_idle: Wait for the page until there are no network connections for at least 500 ms.
|
:param network_idle: Wait for the page until there are no network connections for at least 500 ms.
|
||||||
:param os_randomize: If enabled, Scrapling will randomize the OS fingerprints used. The default is Scrapling matching the fingerprints with the current OS.
|
:param os_randomize: If enabled, Scrapling will randomize the OS fingerprints used. The default is Scrapling matching the fingerprints with the current OS.
|
||||||
:param timeout: The timeout in milliseconds that is used in all operations and waits through the page. The default is 30000
|
:param timeout: The timeout in milliseconds that is used in all operations and waits through the page. The default is 30000
|
||||||
@@ -113,6 +115,7 @@ class StealthyFetcher(BaseFetcher):
|
|||||||
"""
|
"""
|
||||||
engine = CamoufoxEngine(
|
engine = CamoufoxEngine(
|
||||||
proxy=proxy,
|
proxy=proxy,
|
||||||
|
geoip=geoip,
|
||||||
addons=addons,
|
addons=addons,
|
||||||
timeout=timeout,
|
timeout=timeout,
|
||||||
headless=headless,
|
headless=headless,
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ setup(
|
|||||||
'httpx[brotli,zstd]',
|
'httpx[brotli,zstd]',
|
||||||
'playwright>=1.49.1',
|
'playwright>=1.49.1',
|
||||||
'rebrowser-playwright>=1.49.1',
|
'rebrowser-playwright>=1.49.1',
|
||||||
'camoufox>=0.4.7',
|
'camoufox[geoip]>=0.4.7',
|
||||||
'browserforge',
|
'browserforge',
|
||||||
],
|
],
|
||||||
python_requires=">=3.9",
|
python_requires=">=3.9",
|
||||||
|
|||||||
Reference in New Issue
Block a user