Lint fix

Auditors: @SergeyZhukovsky

README.md

@@ -25,7 +25,7 @@ npm install --save ad-block
 
 ```javascript
 
-const {AdBlockClient, FilterOptions} = require('ad-block')
+const { AdBlockClient, FilterOptions } = require('ad-block')
 const client = new AdBlockClient()
 client.parse('/public/ad/*$domain=slashdot.org')
 client.parse('/public/ad3/*$script')

lib/util.js

@@ -3,9 +3,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const request = require('request')
-const {sanitizeABPInput} = require('./filtering')
+const { sanitizeABPInput } = require('./filtering')
 const fs = require('fs')
-const {AdBlockClient, adBlockLists} = require('..')
+const { AdBlockClient, adBlockLists } = require('..')
 
 /**
  * Builds an adblock client, given one or more strings containing filter rules.
@@ -62,13 +62,11 @@ const getSingleListDataFromSingleURL = (listURL, filter, options) => {
   return new Promise((resolve, reject) => {
     request.get(listURL, function (error, response, body) {
       if (error) {
-        console.error(`Request error: ${error}`)
-        reject()
+        reject(new Error(`Request error: ${error}`))
         return
       }
       if (response.statusCode !== 200) {
-        console.error(`Error status code ${response.statusCode} returned for URL: ${listURL}`)
-        reject()
+        reject(new Error(`Error status code ${response.statusCode} returned for URL: ${listURL}`))
         return
       }
       if (filter) {
@@ -103,17 +101,15 @@ const makeAdBlockClientFromListURL = (listURL, filter, options) => {
         body = sanitizeABPInput(body)
         resolve(makeAdBlockClientFromString(body, options))
       }).catch((error) => {
-        console.error(`getSingleListDataFromSingleURL error: ${error}`)
-        reject()
+        reject(new Error(`getSingleListDataFromSingleURL error: ${error}`))
       })
     } else {
       console.log(`${listURL}...`)
       getSingleListDataFromSingleURL(listURL, filter).then((listData) => {
         const body = sanitizeABPInput(listData)
         resolve(makeAdBlockClientFromString(body, options))
       }).catch((error) => {
-        console.error(`getSingleListDataFromSingleURL error: ${error}`)
-        reject()
+        reject(new Error(`getSingleListDataFromSingleURL error: ${error}`))
       })
     }
   })
@@ -148,7 +144,7 @@ const makeAdBlockClientFromListUUID = (uuid, options) => {
     list = adBlockLists.malware.find((l) => l.uuid === uuid)
   }
   if (!list) {
-    return Promise.reject()
+    return Promise.reject(new Error(`No list found for UUID ${uuid}`))
   }
 
   const filterFn = getListFilterFunction(uuid)
@@ -181,13 +177,11 @@ const getListBufferFromURL = (listURL, filter) => {
   return new Promise((resolve, reject) => {
     request.get(listURL, function (error, response, body) {
       if (error) {
-        console.error(`Request error: ${error}`)
-        reject()
+        reject(new Error(`Request error: ${error}`))
         return
       }
       if (response.statusCode !== 200) {
-        console.error(`Error status code ${response.statusCode} returned for URL: ${listURL}`)
-        reject()
+        reject(new Error(`Error status code ${response.statusCode} returned for URL: ${listURL}`))
         return
       }
       if (filter) {

scripts/check.js

@@ -24,8 +24,8 @@
  *   node scripts/check.js  --uuid 67F880F5-7602-4042-8A3D-01481FD7437A --stats
 */
 const commander = require('commander')
-const {makeAdBlockClientFromListUUID, makeAdBlockClientFromDATFile, makeAdBlockClientFromListURL, makeAdBlockClientFromString, makeAdBlockClientFromFilePath, readSiteList} = require('../lib/util')
-const {FilterOptions} = require('..')
+const { makeAdBlockClientFromListUUID, makeAdBlockClientFromDATFile, makeAdBlockClientFromListURL, makeAdBlockClientFromString, makeAdBlockClientFromFilePath, readSiteList } = require('../lib/util')
+const { FilterOptions } = require('..')
 
 const filterStringToFilterOption = (val) => FilterOptions[val]
 

scripts/generateDataFiles.js

@@ -2,13 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {AdBlockClient, FilterOptions} = require('..')
+const { AdBlockClient, FilterOptions } = require('..')
 const path = require('path')
 const fs = require('fs')
 const request = require('request')
 const braveUnbreakPath = './test/data/brave-unbreak.txt'
-const {getListBufferFromURL, getListFilterFunction} = require('../lib/util')
-const {adBlockLists} = require('..')
+const { getListBufferFromURL, getListFilterFunction } = require('../lib/util')
+const { adBlockLists } = require('..')
 
 let totalExceptionFalsePositives = 0
 let totalNumFalsePositives = 0
@@ -38,13 +38,11 @@ const generateDataFileFromURL = (listURL, outputDATFilename, filter) => {
     console.log(`${listURL}...`)
     request.get(listURL, function (error, response, body) {
       if (error) {
-        console.error(`Request error: ${error}`)
-        reject()
+        reject(new Error(`Request error: ${error}`))
         return
       }
       if (response.statusCode !== 200) {
-        console.error(`Error status code ${response.statusCode} returned for URL: ${listURL}`)
-        reject()
+        reject(new Error(`Error status code ${response.statusCode} returned for URL: ${listURL}`))
         return
       }
       const braveUnbreakBody = fs.readFileSync(braveUnbreakPath, 'utf8')

scripts/generateManifestFiles.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {AdBlockClient} = require('..')
+const { AdBlockClient } = require('..')
 const fs = require('fs')
 
 const client = new AdBlockClient()

scripts/uploadDataFiles.js

@@ -32,8 +32,7 @@ const uploadFile = (key, filePath, filename) => {
     var uploader = client.uploadFile(params)
     process.stdout.write(`Started uploading to: ${params.s3Params.Key}... `)
     uploader.on('error', function (err) {
-      console.error('Unable to upload:', err.stack, 'Do you have ~/.aws/credentials filled out?')
-      reject()
+      reject(new Error(`Unable to upload, do you have ~/.aws/credentials filled out? ${err}`))
     })
     uploader.on('end', function (params) {
       console.log('completed')

test/js/filterListTest.js

@@ -4,12 +4,12 @@
 /* global describe, it */
 
 const assert = require('assert')
-const {adBlockLists} = require('../..')
+const { adBlockLists } = require('../..')
 
 describe('adBlockLists', function () {
   describe('default', function () {
     it('contains 4 default lists', function () {
-      assert.equal(adBlockLists.default.length, 5)
+      assert.strictEqual(adBlockLists.default.length, 5)
     })
     it('has uuid property', function () {
       adBlockLists.default.forEach((list) => {

test/js/filteringTest.js

@@ -4,11 +4,11 @@
 /* global describe, it */
 
 const assert = require('assert')
-const {sanitizeABPInput, extraConcatRules} = require('../../lib/filtering')
+const { sanitizeABPInput, extraConcatRules } = require('../../lib/filtering')
 const filteredOutRule = '*/test'
 const predicate = (rule) => !rule.startsWith('*')
 
-sanitizeABPInputFiltered = (input, filterPredicate) =>
+const sanitizeABPInputFiltered = (input, filterPredicate) =>
   sanitizeABPInput(input, filterPredicate).split('\n').slice(0, extraConcatRules.length * -1).join('\n')
 
 describe('filtering', function () {

test/js/fingerprintTest.js

@@ -4,28 +4,28 @@
 /* global describe, it, before */
 
 const assert = require('assert')
-const {AdBlockClient} = require('../..')
+const { AdBlockClient } = require('../..')
 
 describe('getFingerprint', function () {
   before(function () {
     this.adBlockClient = new AdBlockClient()
   })
   it('Extracts simple fingerprint', function () {
-    assert.equal(this.adBlockClient.getFingerprint('fdasfdsafdas'), 'fdasfd')
+    assert.strictEqual(this.adBlockClient.getFingerprint('fdasfdsafdas'), 'fdasfd')
   })
   it('Does not use special characters for fingerprints', function () {
-    assert.equal(this.adBlockClient.getFingerprint('*fdasfdsafdas'), 'fdasfd')
+    assert.strictEqual(this.adBlockClient.getFingerprint('*fdasfdsafdas'), 'fdasfd')
   })
   it('Extracts host anchored filter fingerprint', function () {
-    assert.equal(this.adBlockClient.getFingerprint('||brave.com'), 'brave.')
+    assert.strictEqual(this.adBlockClient.getFingerprint('||brave.com'), 'brave.')
   })
   it('Does not extract a fingerprint for strings that are too short', function () {
-    assert.equal(this.adBlockClient.getFingerprint('prime'), undefined)
+    assert.strictEqual(this.adBlockClient.getFingerprint('prime'), undefined)
   })
   it('Does not extract a fingerprint for blacklisted strings', function () {
-    assert.equal(this.adBlockClient.getFingerprint('https://'), undefined)
+    assert.strictEqual(this.adBlockClient.getFingerprint('https://'), undefined)
   })
   it('Extract a fingerprint for short host anchored filters', function () {
-    assert.equal(this.adBlockClient.getFingerprint('||a.ca/brianbondy'), 'a.ca/b')
+    assert.strictEqual(this.adBlockClient.getFingerprint('||a.ca/brianbondy'), 'a.ca/b')
   })
 })