mirror of
https://github.com/FlareSolverr/FlareSolverr.git
synced 2025-12-06 17:48:40 +01:00
Compare commits
8 Commits
v3.2.0
...
v3.2.2-hot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c920bea4ca | ||
|
|
a785f83034 | ||
|
|
b42c22f5b1 | ||
|
|
9c62410a8b | ||
|
|
b8768ae17d | ||
|
|
9b2c602a1f | ||
|
|
8316350b98 | ||
|
|
33307ce461 |
7
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
7
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@@ -8,6 +8,13 @@ body:
|
||||
options:
|
||||
- label: I have checked the README
|
||||
required: true
|
||||
- type: checkboxes
|
||||
attributes:
|
||||
label: Have you followed our Troubleshooting?
|
||||
description: Please follow our <a href="https://github.com/FlareSolverr/FlareSolverr/wiki/Troubleshooting">Troubleshooting</a>.
|
||||
options:
|
||||
- label: I have followed your Troubleshooting
|
||||
required: true
|
||||
- type: checkboxes
|
||||
attributes:
|
||||
label: Is there already an issue for your problem?
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -124,3 +124,6 @@ venv.bak/
|
||||
.mypy_cache/
|
||||
.dmypy.json
|
||||
dmypy.json
|
||||
|
||||
# node
|
||||
node_modules/
|
||||
@@ -1,5 +1,14 @@
|
||||
# Changelog
|
||||
|
||||
## v3.2.2 (2023/07/16)
|
||||
|
||||
* Workaround for updated 'verify your are human' check
|
||||
|
||||
## v3.2.1 (2023/06/10)
|
||||
|
||||
* Kill dead Chrome processes in Windows
|
||||
* Fix Chrome GL erros in ASUSTOR NAS
|
||||
|
||||
## v3.2.0 (2023/05/23)
|
||||
|
||||
* Support "proxy" param in requests and sessions
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "flaresolverr",
|
||||
"version": "3.2.0",
|
||||
"version": "3.2.2",
|
||||
"description": "Proxy server to bypass Cloudflare protection",
|
||||
"author": "Diego Heras (ngosang / ngosang@hotmail.es)",
|
||||
"license": "MIT"
|
||||
|
||||
@@ -729,6 +729,15 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
|
||||
logger.debug("gracefully closed browser")
|
||||
except Exception as e: # noqa
|
||||
logger.debug(e, exc_info=True)
|
||||
# Force kill Chrome process in Windows
|
||||
# https://github.com/FlareSolverr/FlareSolverr/issues/772
|
||||
if os.name == 'nt':
|
||||
try:
|
||||
subprocess.call(['taskkill', '/f', '/pid', str(self.browser_pid)],
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL)
|
||||
except Exception:
|
||||
pass
|
||||
if (
|
||||
hasattr(self, "keep_user_data_dir")
|
||||
and hasattr(self, "user_data_dir")
|
||||
|
||||
16
src/utils.py
16
src/utils.py
@@ -54,6 +54,15 @@ def get_webdriver(proxy: dict = None) -> WebDriver:
|
||||
options.add_argument('--disable-software-rasterizer')
|
||||
options.add_argument('--ignore-certificate-errors')
|
||||
options.add_argument('--ignore-ssl-errors')
|
||||
# fix GL errors in ASUSTOR NAS
|
||||
# https://github.com/FlareSolverr/FlareSolverr/issues/782
|
||||
# https://github.com/microsoft/vscode/issues/127800#issuecomment-873342069
|
||||
# https://peter.sh/experiments/chromium-command-line-switches/#use-gl
|
||||
options.add_argument('--use-gl=swiftshader')
|
||||
# workaround for updated 'verify your are human' check
|
||||
# https://github.com/FlareSolverr/FlareSolverr/issues/811
|
||||
options.add_argument('--auto-open-devtools-for-tabs')
|
||||
options.add_argument('--headless=true')
|
||||
|
||||
if proxy and 'url' in proxy:
|
||||
proxy_url = proxy['url']
|
||||
@@ -94,6 +103,13 @@ def get_webdriver(proxy: dict = None) -> WebDriver:
|
||||
PATCHED_DRIVER_PATH = os.path.join(driver.patcher.data_path, driver.patcher.exe_name)
|
||||
shutil.copy(driver.patcher.executable_path, PATCHED_DRIVER_PATH)
|
||||
|
||||
# workaround for updated 'verify your are human' check
|
||||
# https://github.com/FlareSolverr/FlareSolverr/issues/811
|
||||
driver.execute_script('''window.open("","_blank");''')
|
||||
driver.switch_to.window(window_name=driver.window_handles[0])
|
||||
driver.close()
|
||||
driver.switch_to.window(window_name=driver.window_handles[0])
|
||||
|
||||
# selenium vanilla
|
||||
# options = webdriver.ChromeOptions()
|
||||
# options.add_argument('--no-sandbox')
|
||||
|
||||
Reference in New Issue
Block a user