Noissue - Reimplement public suffix matching more efficiently

lib/abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module abp2blocklist */
 
 "use strict";
 
 let filterClasses = require("filterClasses");
-let tldjs = require("tldjs");
 let punycode = require("punycode");
 
+let {getBaseDomain} = require("./domain");
+
 const selectorLimit = 5000;
 const typeMap = filterClasses.RegExpFilter.typeMap;
 const whitelistableRequestTypes = (typeMap.IMAGE
                                    | typeMap.STYLESHEET
                                    | typeMap.SCRIPT
                                    | typeMap.FONT
                                    | typeMap.MEDIA
                                    | typeMap.POPUP
                                    | typeMap.OBJECT
                                    | typeMap.OBJECT_SUBREQUEST
@@ skipping 180 matching lines @@
 }
 
 function addDomainPrefix(domains)
 {
   let result = [];
 
   for (let domain of domains)
   {
     result.push(domain);
 
-    if (tldjs.getDomain(domain) == domain)
+    if (getBaseDomain(domain) == domain)
       result.push("www." + domain);
   }
 
   return result;
 }
 
 function convertFilterAddRules(rules, filter, action, withResourceTypes)
 {
   let parsed = parseFilterRegexpSource(filter.regexpSource);
 
@@ skipping 230 matching lines @@
 
   for (let filter of this.elemhideExceptions)
     convertFilterAddRules(rules, filter, "ignore-previous-rules", false);
   for (let filter of this.requestFilters)
     convertFilterAddRules(rules, filter, "block", true);
   for (let filter of this.requestExceptions)
     convertFilterAddRules(rules, filter, "ignore-previous-rules", true);
 
   return rules.filter(rule => !hasNonASCI(rule));
 };