Adding test for explicit JS code run

MANIFEST.in

@@ -1,8 +1,8 @@
 recursive-include changedetectionio/api *
 recursive-include changedetectionio/blueprint *
-recursive-include changedetectionio/content_fetchers *
 recursive-include changedetectionio/model *
 recursive-include changedetectionio/processors *
+recursive-include changedetectionio/res *
 recursive-include changedetectionio/static *
 recursive-include changedetectionio/templates *
 recursive-include changedetectionio/tests *

README.md

@@ -91,14 +91,6 @@ We [recommend and use Bright Data](https://brightdata.grsm.io/n0r16zf7eivq) glob
 
 Please :star: star :star: this project and help it grow! https://github.com/dgtlmoon/changedetection.io/
 
-### We have a Chrome extension!
-
-Easily add the current web page to your changedetection.io tool, simply install the extension and click "Sync" to connect it to your existing changedetection.io install.
-
-[<img src="./docs/chrome-extension-screenshot.png" style="max-width:80%;" alt="Chrome Extension to easily add the current web-page to detect a change."  title="Chrome Extension to easily add the current web-page to detect a change."  />](https://chromewebstore.google.com/detail/changedetectionio-website/kefcfmgmlhmankjmnbijimhofdjekbop)
-
-[Goto the Chrome Webstore to download the extension.](https://chromewebstore.google.com/detail/changedetectionio-website/kefcfmgmlhmankjmnbijimhofdjekbop)
-
 ## Installation
 
 ### Docker

changedetectionio/__init__.py

@@ -2,7 +2,7 @@
 
 # Read more https://github.com/dgtlmoon/changedetection.io/wiki
 
-__version__ = '0.45.16'
+__version__ = '0.45.14'
 
 from distutils.util import strtobool
 from json.decoder import JSONDecodeError

changedetectionio/content_fetchers/__init__.py

@@ -30,7 +30,7 @@ def available_fetchers():
 use_playwright_as_chrome_fetcher = os.getenv('PLAYWRIGHT_DRIVER_URL', False)
 if use_playwright_as_chrome_fetcher:
     # @note - For now, browser steps always uses playwright
-    if not strtobool(os.getenv('FAST_PUPPETEER_CHROME_FETCHER', 'False')):
+    if not strtobool(os.getenv('FAST_PUPPETEER_CHROME_FETCHER', 'False')) or False:
         logger.debug('Using Playwright library as fetcher')
         from .playwright import fetcher as html_webdriver
     else:

changedetectionio/content_fetchers/res/stock-not-in-stock.js

@@ -10,16 +10,15 @@ function isItemInStock() {
     const outOfStockTexts = [
         ' أخبرني عندما يتوفر',
         '0 in stock',
-        'actuellement indisponible',
+        'actuellement indisponible',        
         'agotado',
         'article épuisé',
         'artikel zurzeit vergriffen',
         'as soon as stock is available',
         'ausverkauft', // sold out
         'available for back order',
-        'awaiting stock',
-        'back in stock soon',
         'back-order or out of stock',
+        'back in stock soon',
         'backordered',
         'benachrichtigt mich', // notify me
         'brak na stanie',
@@ -46,9 +45,9 @@ function isItemInStock() {
         'no tickets available',
         'not available',
         'not currently available',
-        'not in stock',
+        'not in stock',        
         'notify me when available',
-        'notify when available',
+        'notify when available',            
         'não estamos a aceitar encomendas',
         'out of stock',
         'out-of-stock',
@@ -58,26 +57,20 @@ function isItemInStock() {
         'sold-out',
         'temporarily out of stock',
         'temporarily unavailable',
-        'there were no search results for',
-        'this item is currently unavailable',
         'tickets unavailable',
         'tijdelijk uitverkocht',
         'unavailable tickets',
         'vorbestellung ist bald möglich',
-        'we couldn\'t find any products that match',
         'we do not currently have an estimate of when this product will be back in stock.',
         'we don\'t know when or if this item will be back in stock.',
-        'we were not able to find a match',
         'zur zeit nicht an lager',
         '品切れ',
-        '已售',
         '已售完',
+        '已售',
         '품절'
     ];
 
-
     const vh = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0);
-
     function getElementBaseText(element) {
         // .textContent can include text from children which may give the wrong results
         // scan only immediate TEXT_NODEs, which will be a child of the element
@@ -88,69 +81,29 @@ function isItemInStock() {
         return text.toLowerCase().trim();
     }
 
-    const negateOutOfStockRegex = new RegExp('^([0-9] in stock|add to cart|in stock)', 'ig');
+    const negateOutOfStockRegex = new RegExp('([0-9] in stock|add to cart)', 'ig');
 
     // The out-of-stock or in-stock-text is generally always above-the-fold
     // and often below-the-fold is a list of related products that may or may not contain trigger text
     // so it's good to filter to just the 'above the fold' elements
     // and it should be atleast 100px from the top to ignore items in the toolbar, sometimes menu items like "Coming soon" exist
-
-
-// @todo - if it's SVG or IMG, go into image diff mode
-// %ELEMENTS% replaced at injection time because different interfaces use it with different settings
-
-    console.log("Scanning %ELEMENTS%");
-
-    function collectVisibleElements(parent, visibleElements) {
-        if (!parent) return; // Base case: if parent is null or undefined, return
-
-        // Add the parent itself to the visible elements array if it's of the specified types
-        visibleElements.push(parent);
-
-        // Iterate over the parent's children
-        const children = parent.children;
-        for (let i = 0; i < children.length; i++) {
-            const child = children[i];
-            if (
-                child.nodeType === Node.ELEMENT_NODE &&
-                window.getComputedStyle(child).display !== 'none' &&
-                window.getComputedStyle(child).visibility !== 'hidden' &&
-                child.offsetWidth >= 0 &&
-                child.offsetHeight >= 0 &&
-                window.getComputedStyle(child).contentVisibility !== 'hidden'
-            ) {
-                // If the child is an element and is visible, recursively collect visible elements
-                collectVisibleElements(child, visibleElements);
-            }
-        }
-    }
-
-    const elementsToScan = [];
-    collectVisibleElements(document.body, elementsToScan);
+    const elementsToScan = Array.from(document.getElementsByTagName('*')).filter(element => element.getBoundingClientRect().top + window.scrollY <= vh && element.getBoundingClientRect().top + window.scrollY >= 100);
 
     var elementText = "";
 
     // REGEXS THAT REALLY MEAN IT'S IN STOCK
     for (let i = elementsToScan.length - 1; i >= 0; i--) {
         const element = elementsToScan[i];
-
-        // outside the 'fold' or some weird text in the heading area
-        // .getBoundingClientRect() was causing a crash in chrome 119, can only be run on contentVisibility != hidden
-        if (element.getBoundingClientRect().top + window.scrollY >= vh || element.getBoundingClientRect().top + window.scrollY <= 100) {
-            continue
-        }
-
         elementText = "";
         if (element.tagName.toLowerCase() === "input") {
-            elementText = element.value.toLowerCase().trim();
+            elementText = element.value.toLowerCase();
         } else {
             elementText = getElementBaseText(element);
         }
 
         if (elementText.length) {
             // try which ones could mean its in stock
-            if (negateOutOfStockRegex.test(elementText) && !elementText.includes('(0 products)')) {
-                console.log(`Negating/overriding 'Out of Stock' back to "Possibly in stock" found "${elementText}"`)
+            if (negateOutOfStockRegex.test(elementText)) {
                 return 'Possibly in stock';
             }
         }
@@ -159,34 +112,28 @@ function isItemInStock() {
     // OTHER STUFF THAT COULD BE THAT IT'S OUT OF STOCK
     for (let i = elementsToScan.length - 1; i >= 0; i--) {
         const element = elementsToScan[i];
-        // outside the 'fold' or some weird text in the heading area
-        // .getBoundingClientRect() was causing a crash in chrome 119, can only be run on contentVisibility != hidden
-        if (element.getBoundingClientRect().top + window.scrollY >= vh + 150 || element.getBoundingClientRect().top + window.scrollY <= 100) {
-            continue
-        }
-        elementText = "";
-        if (element.tagName.toLowerCase() === "input") {
-            elementText = element.value.toLowerCase().trim();
-        } else {
-            elementText = getElementBaseText(element);
-        }
+        if (element.offsetWidth > 0 || element.offsetHeight > 0 || element.getClientRects().length > 0) {
+            elementText = "";
+            if (element.tagName.toLowerCase() === "input") {
+                elementText = element.value.toLowerCase();
+            } else {
+                elementText = getElementBaseText(element);
+            }
 
-        if (elementText.length) {
-            // and these mean its out of stock
-            for (const outOfStockText of outOfStockTexts) {
-                if (elementText.includes(outOfStockText)) {
-                    console.log(`Selected 'Out of Stock' - found text "${outOfStockText}" - "${elementText}"`)
-                    return outOfStockText; // item is out of stock
+            if (elementText.length) {
+                // and these mean its out of stock
+                for (const outOfStockText of outOfStockTexts) {
+                    if (elementText.includes(outOfStockText)) {
+                        return outOfStockText; // item is out of stock
+                    }
                 }
             }
         }
     }
 
-    console.log(`Returning 'Possibly in stock' - cant' find any useful matching text`)
     return 'Possibly in stock'; // possibly in stock, cant decide otherwise.
 }
 
 // returns the element text that makes it think it's out of stock
 return isItemInStock().trim()
 
-

changedetectionio/content_fetchers/res/xpath_element_scraper.js

@@ -16,23 +16,24 @@ try {
 }
 
 
+
 // Include the getXpath script directly, easier than fetching
 function getxpath(e) {
-    var n = e;
-    if (n && n.id) return '//*[@id="' + n.id + '"]';
-    for (var o = []; n && Node.ELEMENT_NODE === n.nodeType;) {
-        for (var i = 0, r = !1, d = n.previousSibling; d;) d.nodeType !== Node.DOCUMENT_TYPE_NODE && d.nodeName === n.nodeName && i++, d = d.previousSibling;
-        for (d = n.nextSibling; d;) {
-            if (d.nodeName === n.nodeName) {
-                r = !0;
-                break
+        var n = e;
+        if (n && n.id) return '//*[@id="' + n.id + '"]';
+        for (var o = []; n && Node.ELEMENT_NODE === n.nodeType;) {
+            for (var i = 0, r = !1, d = n.previousSibling; d;) d.nodeType !== Node.DOCUMENT_TYPE_NODE && d.nodeName === n.nodeName && i++, d = d.previousSibling;
+            for (d = n.nextSibling; d;) {
+                if (d.nodeName === n.nodeName) {
+                    r = !0;
+                    break
+                }
+                d = d.nextSibling
             }
-            d = d.nextSibling
+            o.push((n.prefix ? n.prefix + ":" : "") + n.localName + (i || r ? "[" + (i + 1) + "]" : "")), n = n.parentNode
         }
-        o.push((n.prefix ? n.prefix + ":" : "") + n.localName + (i || r ? "[" + (i + 1) + "]" : "")), n = n.parentNode
+        return o.length ? "/" + o.reverse().join("/") : ""
     }
-    return o.length ? "/" + o.reverse().join("/") : ""
-}
 
 const findUpTag = (el) => {
     let r = el
@@ -58,14 +59,14 @@ const findUpTag = (el) => {
 
     // Strategy 2: Keep going up until we hit an ID tag, imagine it's like  #list-widget div h4
     while (r.parentNode) {
-        if (depth === 5) {
+        if (depth == 5) {
             break;
         }
         if ('' !== r.id) {
             chained_css.unshift("#" + CSS.escape(r.id));
             final_selector = chained_css.join(' > ');
             // Be sure theres only one, some sites have multiples of the same ID tag :-(
-            if (window.document.querySelectorAll(final_selector).length === 1) {
+            if (window.document.querySelectorAll(final_selector).length == 1) {
                 return final_selector;
             }
             return null;
@@ -81,60 +82,30 @@ const findUpTag = (el) => {
 
 // @todo - if it's SVG or IMG, go into image diff mode
 // %ELEMENTS% replaced at injection time because different interfaces use it with different settings
-
+var elements = window.document.querySelectorAll("%ELEMENTS%");
 var size_pos = [];
 // after page fetch, inject this JS
 // build a map of all elements and their positions (maybe that only include text?)
 var bbox;
-console.log("Scanning %ELEMENTS%");
+for (var i = 0; i < elements.length; i++) {
+    bbox = elements[i].getBoundingClientRect();
 
-function collectVisibleElements(parent, visibleElements) {
-    if (!parent) return; // Base case: if parent is null or undefined, return
-
-
-    // Add the parent itself to the visible elements array if it's of the specified types
-    const tagName = parent.tagName.toLowerCase();
-    if ("%ELEMENTS%".split(',').includes(tagName)) {
-        visibleElements.push(parent);
+    // Exclude items that are not interactable or visible
+    if(elements[i].style.opacity === "0") {
+        continue
     }
-
-    // Iterate over the parent's children
-    const children = parent.children;
-    for (let i = 0; i < children.length; i++) {
-        const child = children[i];
-        if (
-            child.nodeType === Node.ELEMENT_NODE &&
-            window.getComputedStyle(child).display !== 'none' &&
-            window.getComputedStyle(child).visibility !== 'hidden' &&
-            child.offsetWidth >= 0 &&
-            child.offsetHeight >= 0 &&
-            window.getComputedStyle(child).contentVisibility !== 'hidden'
-        ) {
-            // If the child is an element and is visible, recursively collect visible elements
-            collectVisibleElements(child, visibleElements);
-        }
+    if(elements[i].style.display === "none" || elements[i].style.pointerEvents === "none" ) {
+        continue
     }
-}
-
-// Create an array to hold the visible elements
-const visibleElementsArray = [];
-
-// Call collectVisibleElements with the starting parent element
-collectVisibleElements(document.body, visibleElementsArray);
-
-
-visibleElementsArray.forEach(function (element) {
-
-    bbox = element.getBoundingClientRect();
 
     // Skip really small ones, and where width or height ==0
-    if (bbox['width'] * bbox['height'] < 10) {
-        return
+    if (bbox['width'] * bbox['height'] < 100) {
+        continue;
     }
 
     // Don't include elements that are offset from canvas
-    if (bbox['top'] + scroll_y < 0 || bbox['left'] < 0) {
-        return
+    if (bbox['top']+scroll_y < 0 || bbox['left'] < 0) {
+        continue;
     }
 
     // @todo the getXpath kind of sucks, it doesnt know when there is for example just one ID sometimes
@@ -143,41 +114,46 @@ visibleElementsArray.forEach(function (element) {
 
     // 1st primitive - if it has class, try joining it all and select, if theres only one.. well thats us.
     xpath_result = false;
+
     try {
-        var d = findUpTag(element);
+        var d = findUpTag(elements[i]);
         if (d) {
             xpath_result = d;
         }
     } catch (e) {
         console.log(e);
     }
+
     // You could swap it and default to getXpath and then try the smarter one
     // default back to the less intelligent one
     if (!xpath_result) {
         try {
             // I've seen on FB and eBay that this doesnt work
             // ReferenceError: getXPath is not defined at eval (eval at evaluate (:152:29), <anonymous>:67:20) at UtilityScript.evaluate (<anonymous>:159:18) at UtilityScript.<anonymous> (<anonymous>:1:44)
-            xpath_result = getxpath(element);
+            xpath_result = getxpath(elements[i]);
         } catch (e) {
             console.log(e);
-            return
+            continue;
         }
     }
 
+    if (window.getComputedStyle(elements[i]).visibility === "hidden") {
+        continue;
+    }
 
+    // @todo Possible to ONLY list where it's clickable to save JSON xfer size
     size_pos.push({
         xpath: xpath_result,
         width: Math.round(bbox['width']),
         height: Math.round(bbox['height']),
         left: Math.floor(bbox['left']),
-        top: Math.floor(bbox['top']) + scroll_y,
-        tagName: (element.tagName) ? element.tagName.toLowerCase() : '',
-        tagtype: (element.tagName.toLowerCase() === 'input' && element.type) ? element.type.toLowerCase() : '',
-        isClickable: window.getComputedStyle(element).cursor == "pointer"
+        top: Math.floor(bbox['top'])+scroll_y,
+        tagName: (elements[i].tagName) ? elements[i].tagName.toLowerCase() : '',
+        tagtype: (elements[i].tagName == 'INPUT' && elements[i].type) ? elements[i].type.toLowerCase() : '',
+        isClickable: (elements[i].onclick) || window.getComputedStyle(elements[i]).cursor == "pointer"
     });
 
-});
-
+}
 
 // Inject the current one set in the include_filters, which may be a CSS rule
 // used for displaying the current one in VisualSelector, where its not one we generated.
@@ -204,7 +180,7 @@ if (include_filters.length) {
             }
         } catch (e) {
             // Maybe catch DOMException and alert?
-            console.log("xpath_element_scraper: Exception selecting element from filter " + f);
+            console.log("xpath_element_scraper: Exception selecting element from filter "+f);
             console.log(e);
         }
 
@@ -234,8 +210,8 @@ if (include_filters.length) {
                 }
             }
         }
-
-        if (!q) {
+        
+        if(!q) {
             console.log("xpath_element_scraper: filter element " + f + " was not found");
         }
 
@@ -245,7 +221,7 @@ if (include_filters.length) {
                 width: parseInt(bbox['width']),
                 height: parseInt(bbox['height']),
                 left: parseInt(bbox['left']),
-                top: parseInt(bbox['top']) + scroll_y
+                top: parseInt(bbox['top'])+scroll_y
             });
         }
     }
@@ -253,7 +229,7 @@ if (include_filters.length) {
 
 // Sort the elements so we find the smallest one first, in other words, we find the smallest one matching in that area
 // so that we dont select the wrapping element by mistake and be unable to select what we want
-size_pos.sort((a, b) => (a.width * a.height > b.width * b.height) ? 1 : -1)
+size_pos.sort((a, b) => (a.width*a.height > b.width*b.height) ? 1 : -1)
 
 // Window.width required for proper scaling in the frontend
 return {'size_pos': size_pos, 'browser_width': window.innerWidth};

changedetectionio/flask_app.py

@@ -30,7 +30,6 @@ from flask_compress import Compress as FlaskCompress
 from flask_login import current_user
 from flask_paginate import Pagination, get_page_parameter
 from flask_restful import abort, Api
-from flask_cors import CORS
 from flask_wtf import CSRFProtect
 from loguru import logger
 
@@ -54,9 +53,6 @@ app = Flask(__name__,
             static_folder="static",
             template_folder="templates")
 
-# Enable CORS, especially useful for the Chrome extension to operate from anywhere
-CORS(app)
-
 # Super handy for compressing large BrowserSteps responses and others
 FlaskCompress(app)
 
@@ -1431,13 +1427,6 @@ def changedetection_app(config=None, datastore_o=None):
                     update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': False}))
             flash("{} watches queued for rechecking".format(len(uuids)))
 
-        elif (op == 'clear-errors'):
-            for uuid in uuids:
-                uuid = uuid.strip()
-                if datastore.data['watching'].get(uuid):
-                    datastore.data['watching'][uuid]["last_error"] = False
-            flash(f"{len(uuids)} watches errors cleared")
-
         elif (op == 'clear-history'):
             for uuid in uuids:
                 uuid = uuid.strip()

changedetectionio/processors/text_json_diff.py

@@ -119,7 +119,7 @@ class perform_site_check(difference_detection_processor):
         include_filters_from_tags = self.datastore.get_tag_overrides_for_watch(uuid=uuid, attr='include_filters')
 
         # 1845 - remove duplicated filters in both group and watch include filter
-        include_filters_rule = list(dict.fromkeys(watch.get('include_filters', []) + include_filters_from_tags))
+        include_filters_rule = list({*watch.get('include_filters', []), *include_filters_from_tags})
 
         subtractive_selectors = [*self.datastore.get_tag_overrides_for_watch(uuid=uuid, attr='subtractive_selectors'),
                                  *watch.get("subtractive_selectors", []),

changedetectionio/static/styles/scss/styles.scss

@@ -1096,16 +1096,3 @@ ul {
   white-space: nowrap;
 }
 
-#chrome-extension-link {
-  img {
-    height: 21px;
-    padding: 2px;
-    vertical-align: middle;
-  }
-
-  padding: 9px;
-  border: 1px solid var(--color-grey-800);
-  border-radius: 10px;
-  vertical-align: middle;
-}
-

changedetectionio/static/styles/styles.css

@@ -1180,13 +1180,3 @@ ul {
   .restock-label.not-in-stock {
     background-color: var(--color-background-button-cancel);
     color: #777; }
-
-#chrome-extension-link {
-  padding: 9px;
-  border: 1px solid var(--color-grey-800);
-  border-radius: 10px;
-  vertical-align: middle; }
-  #chrome-extension-link img {
-    height: 21px;
-    padding: 2px;
-    vertical-align: middle; }

changedetectionio/templates/base.html

@@ -147,19 +147,7 @@
     <section class="content">
         <div id="overlay">
             <div class="content">
-                <h4>Try our Chrome extension</h4>
-                <p>
-                    <a id="chrome-extension-link"
-                       title="Try our new Chrome Extension!"
-                       href="https://chromewebstore.google.com/detail/changedetectionio-website/kefcfmgmlhmankjmnbijimhofdjekbop">
-                        <img src="{{url_for('static_content', group='images', filename='Google-Chrome-icon.png')}}">
-                        Chrome Webstore
-                    </a>
-                </p>
-
-                Easily add the current web-page from your browser directly into your changedetection.io tool, more great features coming soon!
-
-                <h4>Changedetection.io needs your support!</h4>
+                <strong>changedetection.io needs your support!</strong><br>
                 <p>
                     You can help us by supporting changedetection.io on these platforms;
                 </p>

changedetectionio/templates/import.html

@@ -107,7 +107,7 @@
                                     <option value="" style="color: #aaa"> -- none --</option>
                                     <option value="url">URL</option>
                                     <option value="title">Title</option>
-                                    <option value="include_filters">CSS/xPath filter</option>
+                                    <option value="include_filter">CSS/xPath filter</option>
                                     <option value="tag">Group / Tag name(s)</option>
                                     <option value="interval_minutes">Recheck time (minutes)</option>
                                 </select></td>

changedetectionio/templates/settings.html

@@ -168,12 +168,12 @@ nav
            </div>
 
             <div class="tab-pane-inner" id="api">
-                <h4>API Access</h4>
+
                 <p>Drive your changedetection.io via API, More about <a href="https://github.com/dgtlmoon/changedetection.io/wiki/API-Reference">API access here</a></p>
 
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.api_access_token_enabled) }}
-                    <div class="pure-form-message-inline">Restrict API access limit by using <code>x-api-key</code> header - required for the Chrome Extension to work</div><br>
+                    <div class="pure-form-message-inline">Restrict API access limit by using <code>x-api-key</code> header</div><br>
                     <div class="pure-form-message-inline"><br>API Key <span id="api-key">{{api_key}}</span>
                         <span style="display:none;" id="api-key-copy" >copy</span>
                     </div>
@@ -181,20 +181,6 @@ nav
                 <div class="pure-control-group">
                     <a href="{{url_for('settings_reset_api_key')}}" class="pure-button button-small button-cancel">Regenerate API key</a>
                 </div>
-                <div class="pure-control-group">
-                    <h4>Chrome Extension</h4>
-                    <p>Easily add any web-page to your changedetection.io installation from within Chrome.</p>
-                    <strong>Step 1</strong> Install the extension, <strong>Step 2</strong> Navigate to this page,
-                    <strong>Step 3</strong> Open the extension from the toolbar and click "<i>Sync API Access</i>"
-                    <p>
-                        <a id="chrome-extension-link"
-                           title="Try our new Chrome Extension!"
-                           href="https://chromewebstore.google.com/detail/changedetectionio-website/kefcfmgmlhmankjmnbijimhofdjekbop">
-                            <img src="{{ url_for('static_content', group='images', filename='Google-Chrome-icon.png') }}">
-                            Chrome Webstore
-                        </a>
-                    </p>
-                </div>
             </div>
             <div class="tab-pane-inner" id="proxies">
                 <div id="recommended-proxy">

changedetectionio/templates/watch-overview.html

@@ -37,7 +37,6 @@
         <button class="pure-button button-secondary button-xsmall" name="op" value="assign-tag" id="checkbox-assign-tag">Tag</button>
         <button class="pure-button button-secondary button-xsmall" name="op" value="mark-viewed">Mark viewed</button>
         <button class="pure-button button-secondary button-xsmall" name="op" value="notification-default">Use default notification</button>
-        <button class="pure-button button-secondary button-xsmall" name="op" value="clear-errors">Clear errors</button>
         <button class="pure-button button-secondary button-xsmall" style="background: #dd4242;" name="op" value="clear-history">Clear/reset history</button>
         <button class="pure-button button-secondary button-xsmall" style="background: #dd4242;" name="op" value="delete">Delete</button>
     </div>

changedetectionio/tests/restock/test_restock.py

@@ -95,7 +95,7 @@ def test_restock_detection(client, live_server):
 
     # We should have a notification
     time.sleep(2)
-    assert os.path.isfile("test-datastore/notification.txt"), "Notification received"
+    assert os.path.isfile("test-datastore/notification.txt")
     os.unlink("test-datastore/notification.txt")
 
     # Default behaviour is to only fire notification when it goes OUT OF STOCK -> IN STOCK
@@ -103,9 +103,4 @@ def test_restock_detection(client, live_server):
     set_original_response()
     client.get(url_for("form_watch_checknow"), follow_redirects=True)
     wait_for_all_checks(client)
-    assert not os.path.isfile("test-datastore/notification.txt"), "No notification should have fired when it went OUT OF STOCK by default"
-
-    # BUT we should see that it correctly shows "not in stock"
-    res = client.get(url_for("index"))
-    assert b'not-in-stock' in res.data, "Correctly showing NOT IN STOCK in the list after it changed from IN STOCK"
-
+    assert not os.path.isfile("test-datastore/notification.txt")

changedetectionio/tests/test_group.py

@@ -321,154 +321,3 @@ def test_clone_tag_on_quickwatchform_add(client, live_server):
 
     res = client.get(url_for("tags.delete_all"), follow_redirects=True)
     assert b'All tags deleted' in res.data
-
-def test_order_of_filters_tag_filter_and_watch_filter(client, live_server):
-
-    # Add a tag with some config, import a tag and it should roughly work
-    res = client.post(
-        url_for("tags.form_tag_add"),
-        data={"name": "test-tag-keep-order"},
-        follow_redirects=True
-    )
-    assert b"Tag added" in res.data
-    assert b"test-tag-keep-order" in res.data
-    tag_filters = [
-            '#only-this', # duplicated filters
-            '#only-this',
-            '#only-this',
-            '#only-this',
-            ]
-
-    res = client.post(
-        url_for("tags.form_tag_edit_submit", uuid="first"),
-        data={"name": "test-tag-keep-order",
-              "include_filters": '\n'.join(tag_filters) },
-        follow_redirects=True
-    )
-    assert b"Updated" in res.data
-    tag_uuid = get_UUID_for_tag_name(client, name="test-tag-keep-order")
-    res = client.get(
-        url_for("tags.form_tag_edit", uuid="first")
-    )
-    assert b"#only-this" in res.data
-
-
-    d = """<html>
-       <body>
-     Some initial text<br>
-     <p id="only-this">And 1 this</p>
-     <br>
-     <p id="not-this">And 2 this</p>
-     <p id="">And 3 this</p><!--/html/body/p[3]/-->
-     <p id="">And 4 this</p><!--/html/body/p[4]/-->
-     <p id="">And 5 this</p><!--/html/body/p[5]/-->
-     <p id="">And 6 this</p><!--/html/body/p[6]/-->
-     <p id="">And 7 this</p><!--/html/body/p[7]/-->
-     <p id="">And 8 this</p><!--/html/body/p[8]/-->
-     <p id="">And 9 this</p><!--/html/body/p[9]/-->
-     <p id="">And 10 this</p><!--/html/body/p[10]/-->
-     <p id="">And 11 this</p><!--/html/body/p[11]/-->
-     <p id="">And 12 this</p><!--/html/body/p[12]/-->
-     <p id="">And 13 this</p><!--/html/body/p[13]/-->
-     <p id="">And 14 this</p><!--/html/body/p[14]/-->
-     <p id="not-this">And 15 this</p><!--/html/body/p[15]/-->
-     </body>
-     </html>
-    """
-
-    with open("test-datastore/endpoint-content.txt", "w") as f:
-        f.write(d)
-
-    test_url = url_for('test_endpoint', _external=True)
-    res = client.post(
-        url_for("import_page"),
-        data={"urls": test_url},
-        follow_redirects=True
-    )
-    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
-
-    filters = [
-            '/html/body/p[3]',
-            '/html/body/p[4]',
-            '/html/body/p[5]',
-            '/html/body/p[6]',
-            '/html/body/p[7]',
-            '/html/body/p[8]',
-            '/html/body/p[9]',
-            '/html/body/p[10]',
-            '/html/body/p[11]',
-            '/html/body/p[12]',
-            '/html/body/p[13]', # duplicated tags
-            '/html/body/p[13]',
-            '/html/body/p[13]',
-            '/html/body/p[13]',
-            '/html/body/p[13]',
-            '/html/body/p[14]',
-            ]
-
-    res = client.post(
-        url_for("edit_page", uuid="first"),
-        data={"include_filters": '\n'.join(filters),
-            "url": test_url,
-            "tags": "test-tag-keep-order",
-            "headers": "",
-            'fetch_backend': "html_requests"},
-        follow_redirects=True
-    )
-    assert b"Updated watch." in res.data
-    wait_for_all_checks(client)
-
-    res = client.get(
-        url_for("preview_page", uuid="first"),
-        follow_redirects=True
-    )
-
-    assert b"And 1 this" in res.data  # test-tag-keep-order
-
-    a_tag_filter_check = b'And 1 this' #'#only-this' of tag_filters
-    # check there is no duplication of tag_filters
-    assert res.data.count(a_tag_filter_check) == 1, f"duplicated filters didn't removed {res.data.count(a_tag_filter_check)} of {a_tag_filter_check} in {res.data=}"
-
-    a_filter_check = b"And 13 this" # '/html/body/p[13]'
-    # check there is no duplication of filters
-    assert res.data.count(a_filter_check) == 1, f"duplicated filters didn't removed. {res.data.count(a_filter_check)} of {a_filter_check} in {res.data=}"
-
-    a_filter_check_not_include = b"And 2 this" # '/html/body/p[2]'
-    assert a_filter_check_not_include not in res.data
-
-    checklist = [
-            b"And 3 this",
-            b"And 4 this",
-            b"And 5 this",
-            b"And 6 this",
-            b"And 7 this",
-            b"And 8 this",
-            b"And 9 this",
-            b"And 10 this",
-            b"And 11 this",
-            b"And 12 this",
-            b"And 13 this",
-            b"And 14 this",
-            b"And 1 this", # result of filter from tag.
-            ]
-    # check whether everything a user requested is there
-    for test in checklist:
-        assert test in res.data
-
-    # check whether everything a user requested is in order of filters.
-    n = 0
-    for test in checklist:
-        t_index = res.data[n:].find(test)
-        # if the text is not searched, return -1.
-        assert t_index >= 0, f"""failed because {test=} not in {res.data[n:]=}
-#####################
-Looks like some feature changed the order of result of filters.
-#####################
-the {test} appeared before. {test in res.data[:n]=}
-{res.data[:n]=}
-        """
-        n += t_index + len(test)
-
-    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
-    assert b'Deleted' in res.data

requirements.txt

@@ -9,7 +9,6 @@ flask-login>=0.6.3
 flask-paginate
 flask_expects_json~=1.7
 flask_restful
-flask_cors # For the Chrome extension to operate
 flask_wtf~=1.2
 flask~=2.3
 inscriptis~=2.2
@@ -36,12 +35,10 @@ dnspython==2.3.0 # related to eventlet fixes
 # jq not available on Windows so must be installed manually
 
 # Notification library
-apprise~=1.7.4
+apprise~=1.7.1
 
 # apprise mqtt https://github.com/dgtlmoon/changedetection.io/issues/315
-# and 2.0.0 https://github.com/dgtlmoon/changedetection.io/issues/2241 not yet compatible
-# use v1.x due to https://github.com/eclipse/paho.mqtt.python/issues/814
-paho-mqtt < 2.0.0
+paho-mqtt
 
 # This mainly affects some ARM builds, which unlike the other builds ignores "ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1"
 # so without this pinning, the newer versions on ARM will forcefully try to build rust, which results in "rust compiler not found"
@@ -75,7 +72,7 @@ pillow
 # playwright is installed at Dockerfile build time because it's not available on all platforms
 
 # experimental release
-pyppeteer-ng==2.0.0rc5
+pyppeteer-ng==2.0.0rc2
 
 # Include pytest, so if theres a support issue we can ask them to run these tests on their setup
 pytest ~=7.2