starred/FlareSolverr
1
0
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2026-09-24 13:40:12 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Make the challenge wait timeout configurable (#1766)

Browse Source
This commit is contained in:
Aki
2026-08-25 05:17:00 +01:00
committed by GitHub
parent 0f05ed8fc9
commit 716451bc30
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+19 -18
View File
@@ -279,24 +279,25 @@ This works like `request.get`, with the addition of the postData parameter. Note
## Environment variables ## Environment variables
| Name | Default | Notes | | Name | Default | Notes |
| ------------------ | ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | |----------------------| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
| LOG_LEVEL | info | Verbosity of the logging. Use `LOG_LEVEL=debug` for more information. | | LOG_LEVEL | info | Verbosity of the logging. Use `LOG_LEVEL=debug` for more information. |
| LOG_FILE | none | Path to capture log to file. Example: `/config/flaresolverr.log`. | | LOG_FILE | none | Path to capture log to file. Example: `/config/flaresolverr.log`. |
| LOG_HTML | false | Only for debugging. If `true` all HTML that passes through the proxy will be logged to the console in `debug` level. | | LOG_HTML | false | Only for debugging. If `true` all HTML that passes through the proxy will be logged to the console in `debug` level. |
| PROXY_URL | none | URL for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `http://127.0.0.1:8080`. | | PROXY_URL | none | URL for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `http://127.0.0.1:8080`. |
| PROXY_USERNAME | none | Username for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `testuser`. | | PROXY_USERNAME | none | Username for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `testuser`. |
| PROXY_PASSWORD | none | Password for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `testpass`. | | PROXY_PASSWORD | none | Password for proxy. Will be overwritten by `request` or `sessions` proxy, if used. Example: `testpass`. |
| CAPTCHA_SOLVER | none | Captcha solving method. It is used when a captcha is encountered. See the Captcha Solvers section. | | CAPTCHA_SOLVER | none | Captcha solving method. It is used when a captcha is encountered. See the Captcha Solvers section. |
| TZ | UTC | Timezone used in the logs and the web browser. Example: `TZ=Europe/London`. | | TZ | UTC | Timezone used in the logs and the web browser. Example: `TZ=Europe/London`. |
| LANG | none | Language used in the web browser. Example: `LANG=en_GB`. | | LANG | none | Language used in the web browser. Example: `LANG=en_GB`. |
| HEADLESS | true | Only for debugging. To run the web browser in headless mode or visible. | | HEADLESS | true | Only for debugging. To run the web browser in headless mode or visible. |
| DISABLE_MEDIA | false | To disable loading images, CSS, and other media in the web browser to save network bandwidth. | | DISABLE_MEDIA | false | To disable loading images, CSS, and other media in the web browser to save network bandwidth. |
| TEST_URL | https://www.google.com | FlareSolverr makes a request on start to make sure the web browser is working. You can change that URL if it is blocked in your country. | | BROWSER_WAIT_TIMEOUT | 1 | Seconds to wait for the web browser to reach an expected page state on each attempt. Increase it on slow hosts or slow websites. |
| PORT | 8191 | Listening port. You don't need to change this if you are running on Docker. | | TEST_URL | https://www.google.com | FlareSolverr makes a request on start to make sure the web browser is working. You can change that URL if it is blocked in your country. |
| HOST | 0.0.0.0 | Listening interface. You don't need to change this if you are running on Docker. | | PORT | 8191 | Listening port. You don't need to change this if you are running on Docker. |
| PROMETHEUS_ENABLED | false | Enable Prometheus exporter. See the Prometheus section below. | | HOST | 0.0.0.0 | Listening interface. You don't need to change this if you are running on Docker. |
| PROMETHEUS_PORT | 8192 | Listening port for Prometheus exporter. See the Prometheus section below. | | PROMETHEUS_ENABLED | false | Enable Prometheus exporter. See the Prometheus section below. |
| PROMETHEUS_PORT | 8192 | Listening port for Prometheus exporter. See the Prometheus section below. |
Environment variables are set differently depending on the operating system. Some examples: Environment variables are set differently depending on the operating system. Some examples:
src/flaresolverr.py
+1
View File
@@ -90,6 +90,7 @@ if __name__ == "__main__":
log_file = os.environ.get('LOG_FILE', None) log_file = os.environ.get('LOG_FILE', None)
log_html = utils.get_config_log_html() log_html = utils.get_config_log_html()
headless = utils.get_config_headless() headless = utils.get_config_headless()
browser_wait_timeout = utils.get_config_browser_wait_timeout()
server_host = os.environ.get('HOST', '0.0.0.0') server_host = os.environ.get('HOST', '0.0.0.0')
server_port = int(os.environ.get('PORT', 8191)) server_port = int(os.environ.get('PORT', 8191))
src/flaresolverr_service.py
+4 -4
View File
@@ -53,7 +53,6 @@ TURNSTILE_SELECTORS = [
"input[name='cf-turnstile-response']" "input[name='cf-turnstile-response']"
] ]
SHORT_TIMEOUT = 1
SESSIONS_STORAGE = SessionsStorage() SESSIONS_STORAGE = SessionsStorage()
@@ -422,6 +421,7 @@ def _evil_logic(req: V1RequestBase, driver: WebDriver, method: str) -> Challenge
logging.info("Challenge detected. Selector found: " + selector) logging.info("Challenge detected. Selector found: " + selector)
break break
browser_wait_timeout = utils.get_config_browser_wait_timeout()
attempt = 0 attempt = 0
if challenge_found: if challenge_found:
while True: while True:
@@ -430,12 +430,12 @@ def _evil_logic(req: V1RequestBase, driver: WebDriver, method: str) -> Challenge
# wait until the title changes # wait until the title changes
for title in CHALLENGE_TITLES: for title in CHALLENGE_TITLES:
logging.debug("Waiting for title (attempt " + str(attempt) + "): " + title) logging.debug("Waiting for title (attempt " + str(attempt) + "): " + title)
WebDriverWait(driver, SHORT_TIMEOUT).until_not(title_is(title)) WebDriverWait(driver, browser_wait_timeout).until_not(title_is(title))
# then wait until all the selectors disappear # then wait until all the selectors disappear
for selector in CHALLENGE_SELECTORS: for selector in CHALLENGE_SELECTORS:
logging.debug("Waiting for selector (attempt " + str(attempt) + "): " + selector) logging.debug("Waiting for selector (attempt " + str(attempt) + "): " + selector)
WebDriverWait(driver, SHORT_TIMEOUT).until_not( WebDriverWait(driver, browser_wait_timeout).until_not(
presence_of_element_located((By.CSS_SELECTOR, selector))) presence_of_element_located((By.CSS_SELECTOR, selector)))
# all elements not found # all elements not found
@@ -453,7 +453,7 @@ def _evil_logic(req: V1RequestBase, driver: WebDriver, method: str) -> Challenge
logging.debug("Waiting for redirect") logging.debug("Waiting for redirect")
# noinspection PyBroadException # noinspection PyBroadException
try: try:
WebDriverWait(driver, SHORT_TIMEOUT).until(staleness_of(html_element)) WebDriverWait(driver, browser_wait_timeout).until(staleness_of(html_element))
except Exception: except Exception:
logging.debug("Timeout waiting for redirect") logging.debug("Timeout waiting for redirect")
src/utils.py
+4
View File
@@ -32,6 +32,10 @@ def get_config_disable_media() -> bool:
return os.environ.get('DISABLE_MEDIA', 'false').lower() == 'true' return os.environ.get('DISABLE_MEDIA', 'false').lower() == 'true'
def get_config_browser_wait_timeout() -> int:
return int(os.environ.get('BROWSER_WAIT_TIMEOUT', 1))
def get_flaresolverr_version() -> str: def get_flaresolverr_version() -> str:
global FLARESOLVERR_VERSION global FLARESOLVERR_VERSION
if FLARESOLVERR_VERSION is not None: if FLARESOLVERR_VERSION is not None: