Bump version 3.3.2

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.3.2 (2023/08/03)
+
+* Fix URL domain in Prometheus exporter
+
 ## v3.3.1 (2023/08/03)
 
 * Fix for Cloudflare verify checkbox

Dockerfile

@@ -62,17 +62,17 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["/usr/local/bin/python", "-u", "/app/flaresolverr.py"]
 
 # Local build
-# docker build -t ngosang/flaresolverr:3.3.1 .
-# docker run -p 8191:8191 ngosang/flaresolverr:3.3.1
+# docker build -t ngosang/flaresolverr:3.3.2 .
+# docker run -p 8191:8191 ngosang/flaresolverr:3.3.2
 
 # Multi-arch build
 # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 # docker buildx create --use
-# docker buildx build -t ngosang/flaresolverr:3.3.1 --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8 .
+# docker buildx build -t ngosang/flaresolverr:3.3.2 --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8 .
 #   add --push to publish in DockerHub
 
 # Test multi-arch build
 # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 # docker buildx create --use
-# docker buildx build -t ngosang/flaresolverr:3.3.1 --platform linux/arm/v7 --load .
-# docker run -p 8191:8191 --platform linux/arm/v7 ngosang/flaresolverr:3.3.1
+# docker buildx build -t ngosang/flaresolverr:3.3.2 --platform linux/arm/v7 --load .
+# docker run -p 8191:8191 --platform linux/arm/v7 ngosang/flaresolverr:3.3.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flaresolverr",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Proxy server to bypass Cloudflare protection",
   "author": "Diego Heras (ngosang / ngosang@hotmail.es)",
   "license": "MIT"

src/bottle_plugins/prometheus_plugin.py

@@ -2,7 +2,8 @@ import logging
 import os
 import urllib.parse
 
-from dtos import V1ResponseBase
+from bottle import request
+from dtos import V1RequestBase, V1ResponseBase
 from metrics import start_metrics_http_server, REQUEST_COUNTER, REQUEST_DURATION
 
 PROMETHEUS_ENABLED = os.environ.get('PROMETHEUS_ENABLED', 'false').lower() == 'true'
@@ -39,8 +40,12 @@ def prometheus_plugin(callback):
 
         domain = "unknown"
         if res.solution and res.solution.url:
-            parsed_url = urllib.parse.urlparse(res.solution.url)
-            domain = parsed_url.hostname
+            domain = parse_domain_url(res.solution.url)
+        else:
+            # timeout error
+            req = V1RequestBase(request.json)
+            if req.url:
+                domain = parse_domain_url(req.url)
 
         run_time = (res.endTimestamp - res.startTimestamp) / 1000
         REQUEST_DURATION.labels(domain=domain).observe(run_time)
@@ -54,4 +59,8 @@ def prometheus_plugin(callback):
             result = "error"
         REQUEST_COUNTER.labels(domain=domain, result=result).inc()
 
+    def parse_domain_url(url):
+        parsed_url = urllib.parse.urlparse(url)
+        return parsed_url.hostname
+
     return wrapper