Issue 6559 - Use Map object for known subscriptions

lib/subscriptionClasses.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 21 matching lines @@
  * @param {string} url    download location of the subscription
  * @param {string} [title]  title of the filter subscription
  * @constructor
  */
 function Subscription(url, title)
 {
   this.url = url;
   this.filters = [];
   if (title)
     this._title = title;
-  Subscription.knownSubscriptions[url] = this;
+  Subscription.knownSubscriptions.set(url, this);
 }
 exports.Subscription = Subscription;
 
 Subscription.prototype =
 {
   /**
    * Download location of the subscription
    * @type {string}
    */
   url: null,
@@ skipping 94 matching lines @@
   toString()
   {
     let buffer = [];
     this.serialize(buffer);
     return buffer.join("\n");
   }
 };
 
 /**
  * Cache for known filter subscriptions, maps URL to subscription objects.
- * @type {Object}
+ * @type {Map.<string,Subscription>}
  */
-Subscription.knownSubscriptions = Object.create(null);
+Subscription.knownSubscriptions = new Map();
 
 /**
  * Returns a subscription from its URL, creates a new one if necessary.
  * @param {string} url
  *   URL of the subscription
  * @return {Subscription}
  *   subscription or null if the subscription couldn't be created
  */
 Subscription.fromURL = function(url)
 {
-  if (url in Subscription.knownSubscriptions)
-    return Subscription.knownSubscriptions[url];
+  let subscription = Subscription.knownSubscriptions.get(url);

[Manish Jethani, 2018/06/06 11:04:42]

No need to call both Map.has and Map.get, only the latter is enough since values
are never null/undefined.

+  if (subscription)
+    return subscription;
 
   if (url[0] != "~")
     return new DownloadableSubscription(url, null);
   return new SpecialSubscription(url);
 };
 
 /**
  * Deserializes a subscription
  *
  * @param {Object}  obj
@@ skipping 117 matching lines @@
  * Creates a new user-defined filter group.
  * @param {string} [title]  title of the new filter group
  * @return {SpecialSubscription}
  */
 SpecialSubscription.create = function(title)
 {
   let url;
   do
   {
     url = "~user~" + Math.round(Math.random() * 1000000);
-  } while (url in Subscription.knownSubscriptions);
+  } while (Subscription.knownSubscriptions.has(url));
   return new SpecialSubscription(url, title);
 };
 
 /**
  * Creates a new user-defined filter group and adds the given filter to it.
  * This group will act as the default group for this filter type.
  * @param {Filter} filter
  * @return {SpecialSubscription}
  */
 SpecialSubscription.createForFilter = function(filter)
@@ skipping 245 matching lines @@
     if (this.errors)
       buffer.push("errors=" + this.errors);
     if (this.version)
       buffer.push("version=" + this.version);
     if (this.requiredVersion)
       buffer.push("requiredVersion=" + this.requiredVersion);
     if (this.downloadCount)
       buffer.push("downloadCount=" + this.downloadCount);
   }
 });