ad-block - npm Package Compare versions

Comparing version 3.0.5 to 3.1.8

lib/util.js

@@ -6,7 +6,5 @@ /* This Source Code Form is subject to the terms of the Mozilla Public
 const request = require('request')
-const regions = require('./regions')
-const malware = require('./malware')
 const {sanitizeABPInput} = require('./filtering')
 const fs = require('fs')
-const {AdBlockClient} = require('..')
+const {AdBlockClient, adBlockLists} = require('..')
 
@@ -105,13 +103,24 @@ const makeAdBlockClientFromString = (filterRuleData) => {
 
+const getListFilterFunction = (uuid) => {
+  if (uuid === 'FBB430E8-3910-4761-9373-840FC3B43FF2') {
+    return (input) => input.split('\n').slice(4)
+      .map((line) => `||${line}`).join('\n')
+  }
+  return undefined
+}
+
 const makeAdBlockClientFromListUUID = (uuid) => {
-  let list = regions.find((l) => l.uuid === uuid)
+  let list = adBlockLists.default.find((l) => l.uuid === uuid)
   if (!list) {
-    list = malware.find((l) => l.uuid === uuid)
+    list = adBlockLists.regions.find((l) => l.uuid === uuid)
   }
   if (!list) {
-    Promise.reject()
-    return
+    list = adBlockLists.malware.find((l) => l.uuid === uuid)
   }
+  if (!list) {
+    return Promise.reject()
+  }
 
-  return makeAdBlockClientFromListURL(list.listURL, list.filter)
+  const filterFn = getListFilterFunction(uuid)
+  return makeAdBlockClientFromListURL(list.listURL, filterFn)
 }
@@ -167,3 +176,4 @@
   getListBufferFromURL,
-  readSiteList
+  readSiteList,
+  getListFilterFunction
 }

package.json

 {
   "name": "ad-block",
   "main": "./build/Release/ad-block",
-  "version": "3.0.5",
+  "version": "3.1.8",
   "description": "Ad block engine used in the Brave browser for ABP filter syntax based lists like EasyList.",
@@ -6,0 +6,0 @@ "directories": {

scripts/check.js

@@ -60,3 +60,3 @@ /* This Source Code Form is subject to the terms of the Mozilla Public
   } else {
-    const defaultLists = require('../lib/defaultAdblockLists')
+    const defaultLists = require('../').adBlockLists.default
       .map((listObj) => listObj.listURL)
@@ -63,0 +63,0 @@ p = makeAdBlockClientFromListURL(defaultLists)

scripts/generateDataFiles.js

 const {AdBlockClient, FilterOptions} = require('..')
 const path = require('path')
 const fs = require('fs')
-const regions = require('../lib/regions')
-const malware = require('../lib/malware')
-const defaultAdblockLists = require('../lib/defaultAdblockLists')
 const request = require('request')
 const braveUnbreakPath = './test/data/brave-unbreak.txt'
-const {getListBufferFromURL} = require('../lib/util')
+const {getListBufferFromURL, getListFilterFunction} = require('../lib/util')
+const {adBlockLists} = require('..')
 
@@ -60,3 +58,3 @@ let totalExceptionFalsePositives = 0
   let p = Promise.resolve()
-  regions.forEach((region) => {
+  adBlockLists.regions.forEach((region) => {
     p = p.then(generateDataFileFromURL.bind(null, region.listURL, `${region.uuid}.dat`))
@@ -76,3 +74,4 @@ })
     console.log(`${l.listURL}...`)
-    promises.push(getListBufferFromURL(l.listURL, l.filter))
+    const filterFn = getListFilterFunction(l.uuid)
+    promises.push(getListBufferFromURL(l.listURL, filterFn))
   })
@@ -88,4 +87,4 @@ let p = Promise.all(promises)
 
-const generateDataFilesForMalware = generateDataFilesForList.bind(null, malware, 'SafeBrowsingData.dat')
-const generateDataFilesForDefaultAdblock = generateDataFilesForList.bind(null, defaultAdblockLists, 'ABPFilterParserData.dat')
+const generateDataFilesForMalware = generateDataFilesForList.bind(null, adBlockLists.malware, 'SafeBrowsingData.dat')
+const generateDataFilesForDefaultAdblock = generateDataFilesForList.bind(null, adBlockLists.default, 'ABPFilterParserData.dat')
 
@@ -92,0 +91,0 @@ const checkSiteList = (client, siteList) => {

No alert changes

Improved metrics

Total package byte prevSize

16368025

increased by0.05%

Number of package files

917

increased by0.55%

Worsened metrics

Lines of code

2528

decreased by-4.57%

No dependency changes