Merge branch 'master' into restock-visualselector-refactor

CONTRIBUTING.md

@@ -2,7 +2,7 @@ Contributing is always welcome!
 
 I am no professional flask developer, if you know a better way that something can be done, please let me know!
 
-Otherwise, it's always best to PR into the `master` branch.
+Otherwise, it's always best to PR into the `dev` branch.
 
 Please be sure that all new functionality has a matching test!
 

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.17'
+__version__ = '0.45.14'
 
 from distutils.util import strtobool
 from json.decoder import JSONDecodeError

changedetectionio/content_fetchers/res/puppeteer_fetch.js

@@ -18,6 +18,7 @@ module.exports = async ({page, context}) => {
 
     await page.setBypassCSP(true)
     await page.setExtraHTTPHeaders(req_headers);
+    var total_size = 0;
 
     if (user_agent) {
         await page.setUserAgent(user_agent);
@@ -42,102 +43,89 @@ module.exports = async ({page, context}) => {
         height: 768,
         deviceScaleFactor: 1,
     });
-
     await page.setRequestInterception(true);
-    if (disk_cache_dir) {
-        console.log(">>>>>>>>>>>>>>> LOCAL DISK CACHE ENABLED <<<<<<<<<<<<<<<<<<<<<");
+    await page.setCacheEnabled(false);
+
+
+    await page.evaluateOnNewDocument('navigator.serviceWorker.register = () => { console.warn("Service Worker registration blocked by Playwright")}');
+
+    await page.evaluateOnNewDocument(`
+   
+  const toBlob = HTMLCanvasElement.prototype.toBlob;
+  const toDataURL = HTMLCanvasElement.prototype.toDataURL;
+
+    HTMLCanvasElement.prototype.manipulate = function() {
+    console.warn("ma");
+    const {width, height} = this;
+    const context = this.getContext('2d');
+    var dt = new Date();
+    
+    const shift = {
+      'r': dt.getDay()-3,
+      'g': dt.getDay()-3,
+      'b': dt.getDay()-3
+    };
+    console.log(shift);
+    const matt = context.getImageData(0, 0, width, height);
+    for (let i = 0; i < height; i += Math.max(1, parseInt(height / 10))) {
+      for (let j = 0; j < width; j += Math.max(1, parseInt(width / 10))) {
+        const n = ((i * (width * 4)) + (j * 4));
+        matt.data[n + 0] = matt.data[n + 0] + shift.r;
+        matt.data[n + 1] = matt.data[n + 1] + shift.g;
+        matt.data[n + 2] = matt.data[n + 2] + shift.b;
+      }
     }
-    const fs = require('fs');
-    const crypto = require('crypto');
+    context.putImageData(matt, 0, 0);
+  };
 
-    function file_is_expired(file_path) {
-        if (!fs.existsSync(file_path)) {
-            return true;
+  Object.defineProperty(HTMLCanvasElement.prototype, 'toBlob', {
+    value: function() {
+    console.warn("toblob");
+      if (true) {
+        try {
+          this.manipulate();
         }
-        var stats = fs.statSync(file_path);
-        const now_date = new Date();
-        const expire_seconds = 300;
-        if ((now_date / 1000) - (stats.mtime.getTime() / 1000) > expire_seconds) {
-            console.log("CACHE EXPIRED: " + file_path);
-            return true;
+        catch(e) {
+          console.warn('manipulation failed', e);
         }
-        return false;
-
+      }
+      return toBlob.apply(this, arguments);
     }
-
-    page.on('request', async (request) => {
-        // General blocking of requests that waste traffic
-        if (block_url_list.some(substring => request.url().toLowerCase().includes(substring))) return request.abort();
-
-        if (disk_cache_dir) {
-            const url = request.url();
-            const key = crypto.createHash('md5').update(url).digest("hex");
-            const dir_path = disk_cache_dir + key.slice(0, 1) + '/' + key.slice(1, 2) + '/' + key.slice(2, 3) + '/';
-
-            // https://stackoverflow.com/questions/4482686/check-synchronously-if-file-directory-exists-in-node-js
-
-            if (fs.existsSync(dir_path + key)) {
-                console.log("* CACHE HIT , using - " + dir_path + key + " - " + url);
-                const cached_data = fs.readFileSync(dir_path + key);
-                // @todo headers can come from dir_path+key+".meta" json file
-                request.respond({
-                    status: 200,
-                    //contentType: 'text/html', //@todo
-                    body: cached_data
-                });
-                return;
-            }
+  });
+  Object.defineProperty(HTMLCanvasElement.prototype, 'toDataURL', {
+    value: function() {
+        console.warn("todata");
+      if (true) {
+        try {
+          this.manipulate();
         }
-        request.continue();
+        catch(e) {
+          console.warn('manipulation failed', e);
+        }
+      }
+      return toDataURL.apply(this, arguments);
+    }
+  });
+
+
+  Object.defineProperty(navigator, 'webdriver', {get: () => false});
+`)
+
+    await page.emulateTimezone('America/Chicago');
+
+    var r = await page.goto(url, {
+        waitUntil: 'load', timeout: 0
     });
 
-
-    if (disk_cache_dir) {
-        page.on('response', async (response) => {
-            const url = response.url();
-            // Basic filtering for sane responses
-            if (response.request().method() != 'GET' || response.request().resourceType() == 'xhr' || response.request().resourceType() == 'document' || response.status() != 200) {
-                console.log("Skipping (not useful) - Status:" + response.status() + " Method:" + response.request().method() + " ResourceType:" + response.request().resourceType() + " " + url);
-                return;
-            }
-            if (no_cache_list.some(substring => url.toLowerCase().includes(substring))) {
-                console.log("Skipping (no_cache_list) - " + url);
-                return;
-            }
-            if (url.toLowerCase().includes('data:')) {
-                console.log("Skipping (embedded-data) - " + url);
-                return;
-            }
-            response.buffer().then(buffer => {
-                if (buffer.length > 100) {
-                    console.log("Cache - Saving " + response.request().method() + " - " + url + " - " + response.request().resourceType());
-
-                    const key = crypto.createHash('md5').update(url).digest("hex");
-                    const dir_path = disk_cache_dir + key.slice(0, 1) + '/' + key.slice(1, 2) + '/' + key.slice(2, 3) + '/';
-
-                    if (!fs.existsSync(dir_path)) {
-                        fs.mkdirSync(dir_path, {recursive: true})
-                    }
-
-                    if (fs.existsSync(dir_path + key)) {
-                        if (file_is_expired(dir_path + key)) {
-                            fs.writeFileSync(dir_path + key, buffer);
-                        }
-                    } else {
-                        fs.writeFileSync(dir_path + key, buffer);
-                    }
-                }
-            });
-        });
+// https://github.com/puppeteer/puppeteer/issues/2479#issuecomment-408263504
+    if (r === null) {
+        r = await page.waitForResponse(() => true);
     }
 
-    const r = await page.goto(url, {
-        waitUntil: 'load'
-    });
-
-    await page.waitForTimeout(1000);
+    await page.waitForTimeout(4000);
     await page.waitForTimeout(extra_wait_ms);
 
+
     if (execute_js) {
         await page.evaluate(execute_js);
         await page.waitForTimeout(200);
@@ -176,6 +164,8 @@ module.exports = async ({page, context}) => {
     }
 
     var html = await page.content();
+    page.close();
+
     return {
         data: {
             'content': html,
@@ -183,8 +173,9 @@ module.exports = async ({page, context}) => {
             'instock_data': instock_data,
             'screenshot': b64s,
             'status_code': r.status(),
-            'xpath_data': xpath_data
+            'xpath_data': xpath_data,
+            'total_size': total_size
         },
         type: 'application/json',
     };
-};
+};

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

@@ -17,9 +17,8 @@ function isItemInStock() {
         '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',
@@ -58,20 +57,16 @@ 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',
         '品切れ',
-        '已售',
         '已售完',
+        '已售',
         '품절'
     ];
 
@@ -161,6 +156,8 @@ function isItemInStock() {
         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
+
+         // Should be in the "above the fold" plus about 150px
         if (element.getBoundingClientRect().top + window.scrollY >= vh + 150 || element.getBoundingClientRect().top + window.scrollY <= 100) {
             continue
         }

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)
 
@@ -516,35 +512,21 @@ def changedetection_app(config=None, datastore_o=None):
 
         watch = datastore.data['watching'].get(watch_uuid) if watch_uuid else None
 
-        notification_urls = request.form['notification_urls'].strip().splitlines()
-
-        if not notification_urls:
-            logger.debug("Test notification - Trying by group/tag")
-            if request.form['tags'].strip():
-                for k in request.form['tags'].split(','):
-                    tag = datastore.tag_exists_by_name(k.strip())
-                    notification_urls = tag.get('notifications_urls') if tag and tag.get('notifications_urls') else None
-
-        if not notification_urls:
-            logger.debug("Test notification - Trying by global system settings notifications")
-            if datastore.data['settings']['application'].get('notification_urls'):
-                notification_urls = datastore.data['settings']['application']['notification_urls']
-
-
-        if not notification_urls:
+        # validate URLS
+        if not len(request.form['notification_urls'].strip()):
             return make_response({'error': 'No Notification URLs set'}, 400)
 
-        for n_url in notification_urls:
-            if len(n_url.strip()):
-                if not apobj.add(n_url):
-                    message = '{} is not a valid AppRise URL.'.format(n_url)
+        for server_url in request.form['notification_urls'].splitlines():
+            if len(server_url.strip()):
+                if not apobj.add(server_url):
+                    message = '{} is not a valid AppRise URL.'.format(server_url)
                     return make_response({'error': message}, 400)
 
         try:
             # use the same as when it is triggered, but then override it with the form test values
             n_object = {
                 'watch_url': request.form['window_url'],
-                'notification_urls': notification_urls
+                'notification_urls': request.form['notification_urls'].splitlines()
             }
 
             # Only use if present, if not set in n_object it should use the default system value
@@ -1445,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/static/js/notifications.js

@@ -28,11 +28,15 @@ $(document).ready(function() {
       notification_format: $('#notification_format').val(),
       notification_title: $('#notification_title').val(),
       notification_urls: $('.notification-urls').val(),
-      tags: $('#tags').val(),
       window_url: window.location.href,
     }
 
 
+    if (!data['notification_urls'].length) {
+      alert("Notification URL list is empty, cannot send test.")
+      return;
+    }
+
     $.ajax({
       type: "POST",
       url: notification_base_url,

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/store.py

@@ -657,10 +657,7 @@ class ChangeDetectionStore:
         return res
 
     def tag_exists_by_name(self, tag_name):
-        # Check if any tag dictionary has a 'title' attribute matching the provided tag_name
-        tags = self.__data['settings']['application']['tags'].values()
-        return next((v for v in tags if v.get('title', '').lower() == tag_name.lower()),
-                    None)
+        return any(v.get('title', '').lower() == tag_name.lower() for k, v in self.__data['settings']['application']['tags'].items())
 
     def get_updates_available(self):
         import inspect

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/edit.html

@@ -323,7 +323,6 @@ nav
                     <span class="pure-form-message-inline">
                         <ul>
                           <li> Remove HTML element(s) by CSS selector before text conversion. </li>
-                          <li> Don't paste HTML here, use only CSS selectors </li>
                           <li> Add multiple elements or CSS selectors per line to ignore multiple parts of the HTML. </li>
                         </ul>
                       </span>
@@ -437,7 +436,7 @@ Unavailable") }}
                     <div class="pure-control-group">
                         {% if visualselector_enabled %}
                             <span class="pure-form-message-inline">
-                                The Visual Selector tool lets you select the <i>text</i> elements that will be used for the change detection &dash; after the <i>Browser Steps</i> has completed, this tool is a helper to manage filters in the  "CSS/JSONPath/JQ/XPath Filters" box of the <a href="#filters-and-triggers">Filters & Triggers</a> tab.
+                                The Visual Selector tool lets you select the <i>text</i> elements that will be used for the change detection &dash; after the <i>Browser Steps</i> has completed.<br><br>
                             </span>
 
                             <div id="selector-header">

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")

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