Merge branch 'master' into pip-security-updates

.github/workflows/test-only.yml

@@ -29,7 +29,7 @@ jobs:
           docker network create changedet-network
 
           # Selenium+browserless
-          docker run --network changedet-network -d --hostname selenium  -p 4444:4444 --rm --shm-size="2g"  selenium/standalone-chrome:4.14.1
+          docker run --network changedet-network -d --hostname selenium  -p 4444:4444 --rm --shm-size="2g"  selenium/standalone-chrome:4
           docker run --network changedet-network -d --hostname browserless -e "FUNCTION_BUILT_INS=[\"fs\",\"crypto\"]" -e "DEFAULT_LAUNCH_ARGS=[\"--window-size=1920,1080\"]" --rm  -p 3000:3000  --shm-size="2g"  browserless/chrome:1.60-chrome-stable
 
       - name: Build changedetection.io container for testing

changedetectionio/content_fetcher.py

@@ -333,9 +333,8 @@ class base_html_playwright(Fetcher):
             # Remove username/password if it exists in the URL or you will receive "ERR_NO_SUPPORTED_PROXIES" error
             # Actual authentication handled by Puppeteer/node
             o = urlparse(self.proxy.get('server'))
-            # Remove scheme, socks5:// doesnt always work and it will autodetect anyway
-            proxy_url = urllib.parse.quote(o._replace(netloc="{}:{}".format(o.hostname, o.port)).geturl().replace(f"{o.scheme}://", '', 1))
-            browserless_function_url = f"{browserless_function_url}&--proxy-server={proxy_url}&dumpio=true"
+            proxy_url = urllib.parse.quote(o._replace(netloc="{}:{}".format(o.hostname, o.port)).geturl())
+            browserless_function_url = f"{browserless_function_url}&--proxy-server={proxy_url}"
 
         try:
             amp = '&' if '?' in browserless_function_url else '?'

changedetectionio/templates/edit.html

@@ -455,15 +455,15 @@ Unavailable") }}
                         <tbody>
                         <tr>
                             <td>Check count</td>
-                            <td>{{ watch.check_count }}</td>
+                            <td>{{ "{:,}".format( watch.check_count) }}</td>
                         </tr>
                         <tr>
                             <td>Consecutive filter failures</td>
-                            <td>{{ watch.consecutive_filter_failures }}</td>
+                            <td>{{ "{:,}".format( watch.consecutive_filter_failures) }}</td>
                         </tr>
                         <tr>
                             <td>History length</td>
-                            <td>{{ watch.history|length }}</td>
+                            <td>{{ "{:,}".format(watch.history|length) }}</td>
                         </tr>
                         <tr>
                             <td>Last fetch time</td>

docker-compose.yml

@@ -68,7 +68,7 @@ services:
 
 #    browser-chrome:
 #        hostname: browser-chrome
-#        image: selenium/standalone-chrome-debug:3.141.59
+#        image: selenium/standalone-chrome:4
 #        environment:
 #            - VNC_NO_PASSWORD=1
 #            - SCREEN_WIDTH=1920