Issue 1162 - Cache notification URL matcher

lib/notification.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 84 matching lines @@
 
   // Compare version suffix (e.g. 0.1alpha < 0.1b1 < 01.b2 < 0.1).
   // However, note that this is a simple string comparision, meaning: b10 < b2
   if (tail1 == tail2)
     return 0;
   if (!tail1 || tail2 && tail1 > tail2)
     return 1;
   return -1;
 }
 
+function initNotificationMatcher(notification)
+{
+  if ("_matcher" in notification || !(notification.urlFilters instanceof Array))
+    return;
+
+  let matcher = new Matcher();
+  for (let urlFilter of notification.urlFilters)
+    matcher.add(Filter.fromText(urlFilter));
+  matcher.toJSON = () => {};
+  notification._matcher = matcher;
+}
+
 /**
  * The object providing actual downloading functionality.
  * @type {Downloader}
  */
 let downloader = null;
 let localData = [];
+let remoteData = [];
 
 /**
  * Regularly fetches notifications and decides which to show.
  * @class
  */
 let Notification = exports.Notification =
 {
   /**
    * Called on module startup.
    */
   init()
   {
+    let notificationdata = Prefs.notificationdata.data;
+    if (notificationdata)
+    {
+      for (let notification of notificationdata.notifications)
+        initNotificationMatcher(notification);
+      remoteData = notificationdata.notifications;
+    }
+
     downloader = new Downloader(this._getDownloadables.bind(this),
                                 INITIAL_DELAY, CHECK_INTERVAL);
     downloader.onExpirationChange = this._onExpirationChange.bind(this);
     downloader.onDownloadSuccess = this._onDownloadSuccess.bind(this);
     downloader.onDownloadError = this._onDownloadError.bind(this);
     onShutdown.add(() => downloader.cancel());
   },
 
   /**
    * Yields a Downloadable instances for the notifications download.
@@ skipping 34 matching lines @@
     {
       let data = JSON.parse(responseText);
       for (let notification of data.notifications)
       {
         if ("severity" in notification)
         {
           if (!("type" in notification))
             notification.type = notification.severity;
           delete notification.severity;
         }
+        initNotificationMatcher(notification);
       }
+      remoteData = data.notifications;
       Prefs.notificationdata.data = data;
     }
     catch (e)
     {
       Cu.reportError(e);
       errorCallback("synchronize_invalid_data");
       return;
     }
 
     Prefs.notificationdata.lastError = 0;
@@ skipping 38 matching lines @@
       showListeners.splice(index, 1);
   },
 
   /**
    * Determines which notification is to be shown next.
    * @param {string} url URL to match notifications to (optional)
    * @return {Object} notification to be shown, or null if there is none
    */
   _getNextToShow(url)
   {
-    let remoteData = [];
-    if (typeof Prefs.notificationdata.data == "object" &&
-        Prefs.notificationdata.data.notifications instanceof Array)
-    {
-      remoteData = Prefs.notificationdata.data.notifications;
-    }
-
     let notifications = localData.concat(remoteData);
     if (notifications.length === 0)
       return null;
 
     const {addonName, addonVersion, application,
            applicationVersion, platform, platformVersion} = require("info");
 
     let targetChecks = {
       extension: v => v == addonName,
       extensionMinVersion:
@@ skipping 38 matching lines @@
             continue;
         }
 
         if (notification.type !== "relentless" &&
             Prefs.notifications_ignoredcategories.indexOf("*") != -1)
         {
           continue;
         }
       }
 
-      if (typeof url === "string" || notification.urlFilters instanceof Array)
+      if (typeof url === "string" || "_matcher" in notification)

[Thomas Greiner, 2018/01/29 15:39:20]

This block contains relevant changes that were made during the rebase.

       {
         if (Prefs.enabled && typeof url === "string" &&
-            notification.urlFilters instanceof Array)
+            "_matcher" in notification)
         {
           let host;
           try
           {
             host = new URL(url).hostname;
           }
           catch (e)
           {
             host = "";
           }
 
           let exception = defaultMatcher.matchesAny(
             url, RegExpFilter.typeMap.DOCUMENT, host, false, null
           );
           if (exception instanceof WhitelistFilter)
             continue;
 
-          let matcher = new Matcher();
-          for (let urlFilter of notification.urlFilters)
-            matcher.add(Filter.fromText(urlFilter));
-          if (!matcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, host,
-              false, null))
-          {
+          if (!notification._matcher.matchesAny(url,
+              RegExpFilter.typeMap.DOCUMENT, host, false, null))
             continue;
-          }
         }
         else
           continue;
       }
 
       if (notification.targets instanceof Array)
       {
         let match = false;
 
         for (let target of notification.targets)
@@ skipping 86 matching lines @@
     return localizedTexts;
   },
 
   /**
    * Adds a local notification.
    * @param {Object} notification notification to add
    */
   addNotification(notification)
   {
     if (localData.indexOf(notification) == -1)
+    {
+      initNotificationMatcher(notification);
       localData.push(notification);
+    }
   },
 
   /**
    * Removes an existing local notification.
    * @param {Object} notification notification to remove
    */
   removeNotification(notification)
   {
     let index = localData.indexOf(notification);
     if (index > -1)
@@ skipping 67 matching lines @@
     else if (index != -1 && forceValue !== true)
       categories.splice(index, 1);
 
     // HACK: JSON values aren't saved unless they are assigned a
     // different object.
     Prefs.notifications_ignoredcategories =
       JSON.parse(JSON.stringify(categories));
   }
 };
 Notification.init();