Updates acorn to v7.1.1

client/init.js

@@ -1,9 +1,9 @@
 'use strict'
 
 const crypto = require('brave-crypto')
-const {generateDeviceIdV2} = require('../lib/crypto')
+const { generateDeviceIdV2 } = require('../lib/crypto')
 const messages = require('./constants/messages')
-const {syncVersion} = require('./config')
+const { syncVersion } = require('./config')
 
 /**
  * Initializes crypto and device ID
@@ -31,7 +31,7 @@ module.exports.init = function () {
         reject(new Error('Invalid crypto seed'))
         return
       }
-      resolve({seed, deviceId, config, deviceIdV2})
+      resolve({ seed, deviceId, config, deviceIdV2 })
     })
   })
 }

client/recordUtil.js

@@ -4,7 +4,7 @@ const deepEqual = require('deep-equal')
 const merge = require('lodash.merge')
 const proto = require('./constants/proto')
 const serializer = require('../lib/serializer')
-const {api} = require('../lib/api.proto.js')
+const { api } = require('../lib/api.proto.js')
 const syncTypes = require('../lib/syncTypes.js')
 
 // ['0', '1', '2']
@@ -62,7 +62,7 @@ const createFromUpdateBookmark = CreateFromUpdate(
         isFolder: false
       }
       const site = createSitePropsFromUpdateSite(bookmark.site)
-      return Object.assign({}, defaultProps, bookmark, {site})
+      return Object.assign({}, defaultProps, bookmark, { site })
     }
   }
 )
@@ -115,7 +115,9 @@ const humanAction = (action) => {
 
 const pickFields = (object, fields) => {
   return fields.reduce((a, x) => {
-    if (object.hasOwnProperty(x)) { a[x] = object[x] }
+    if (Object.prototype.hasOwnProperty.call(object, x)) {
+      a[x] = object[x]
+    }
     return a
   }, {})
 }
@@ -188,8 +190,8 @@ const resolveSiteSettingsRecordWithObject = (record, existingObject) => {
   if (Object.keys(resolvedData).length === 0) {
     return null
   }
-  let resolved = Object.assign({}, record, {[type]: resolvedData})
-  for (let field of commonFields) {
+  const resolved = Object.assign({}, record, { [type]: resolvedData })
+  for (const field of commonFields) {
     if (!recordFields.has(field)) { continue }
     resolved[type][field] = record[type][field]
   }
@@ -214,16 +216,18 @@ module.exports.resolve = (record, existingObject) => {
       return existingObject
         ? nullIgnore()
         : record
-    case proto.actions.UPDATE:
+    case proto.actions.UPDATE: {
       const resolvedUpdate = existingObject
         ? resolveRecordWithObject(record, existingObject)
         : this.createFromUpdate(record)
       return resolvedUpdate || nullIgnore()
-    case proto.actions.DELETE:
+    }
+    case proto.actions.DELETE: {
       const resolvedDelete = existingObject
         ? resolveRecordWithObject(record, existingObject)
         : null
       return resolvedDelete || nullIgnore()
+    }
     default:
       throw new Error(`Invalid record action: ${record.action}`)
   }
@@ -278,7 +282,7 @@ const mergeRecords = (recordsAndObjects) => {
  * @returns {Array.<Object>} Resolved syncRecords to apply to browser data.
  */
 module.exports.resolveRecords = (recordsAndExistingObjects) => {
-  let resolvedRecords = []
+  const resolvedRecords = []
   recordsAndExistingObjects.forEach((item) => {
     if (item) {
       normalizeBookmark(item[0])
@@ -334,7 +338,7 @@ module.exports.syncRecordAsJS = (record) => {
  * @returns {string} e.g. '0' for bookmark
  */
 module.exports.getRecordCategory = (record) => {
-  for (let type in proto.categoryMap) {
+  for (const type in proto.categoryMap) {
     if (record[type]) {
       const categoryName = proto.categoryMap[type]
       if (!categoryName) { return undefined }

client/requestUtil.js

@@ -5,7 +5,7 @@ const cryptoUtil = require('./cryptoUtil')
 const deepEqual = require('deep-equal')
 const recordUtil = require('./recordUtil')
 const proto = require('./constants/proto')
-const {limitConcurrency} = require('../lib/promiseHelper')
+const { limitConcurrency } = require('../lib/promiseHelper')
 const s3Helper = require('../lib/s3Helper')
 const serializer = require('../lib/serializer')
 const LRUCache = require('lru-cache')
@@ -32,10 +32,10 @@ const isExpiredCredentialError = (error) => {
 }
 
 const createAndSubscribeSQSforCategory = function (deviceId, category, thisRef) {
-  let newQueueParams = {
+  const newQueueParams = {
     QueueName: thisRef.sqsName(deviceId, category),
     Attributes: {
-      'MessageRetentionPeriod': s3Helper.SQS_RETENTION
+      MessageRetentionPeriod: s3Helper.SQS_RETENTION
     }
   }
   return new Promise((resolve, reject) => {
@@ -196,7 +196,7 @@ RequestUtil.prototype.parseAWSResponse = function (bytes) {
     sslEnabled: true
   })
 
-  return {s3, postData, expiration, bucket, region, sqs}
+  return { s3, postData, expiration, bucket, region, sqs }
 }
 
 /**
@@ -213,7 +213,7 @@ RequestUtil.prototype.parseAWSResponse = function (bytes) {
  */
 RequestUtil.prototype.list = function (category, startAt, maxRecords, nextContinuationToken, previousFetchTime, opts = {}) {
   const prefix = `${this.apiVersion}/${this.userId}/${category}`
-  let options = {
+  const options = {
     MaxKeys: maxRecords || 1000,
     Bucket: this.bucket,
     Prefix: prefix
@@ -258,7 +258,7 @@ RequestUtil.prototype.list = function (category, startAt, maxRecords, nextContin
     }
 
     // We poll from SQS
-    let notificationParams = {
+    const notificationParams = {
       QueueUrl: `${this.SQSUrlByCat[category]}`,
       AttributeNames: [
         'All'
@@ -273,7 +273,7 @@ RequestUtil.prototype.list = function (category, startAt, maxRecords, nextContin
 
     // We will fetch from both old and new SQS queues until old one gets retired
     if (this.oldSQSUrlByCat[category]) {
-      let oldNotificationParams = Object.assign({}, notificationParams)
+      const oldNotificationParams = Object.assign({}, notificationParams)
       oldNotificationParams.QueueUrl = `${this.oldSQSUrlByCat[category]}`
 
       return s3Helper.listNotifications(
@@ -286,11 +286,13 @@ RequestUtil.prototype.list = function (category, startAt, maxRecords, nextContin
         }
         return s3Helper.listNotifications(
           this.sqs, oldNotificationParams, category, prefix).then((oldValues) => {
-          if (deepEqual(values.contents, oldValues.contents, {strict: true})) {
+          if (deepEqual(values.contents, oldValues.contents, { strict: true })) {
             return values
           }
-          return {contents: values.contents.concat(oldValues.contents),
-            createdTimeStamp: values.createdTimeStamp}
+          return {
+            contents: values.contents.concat(oldValues.contents),
+            createdTimeStamp: values.createdTimeStamp
+          }
         })
       })
     }
@@ -310,7 +312,7 @@ const CATEGORIES_FOR_SQS = [proto.categories.BOOKMARKS, proto.categories.PREFERE
  * @returns {boolean}
 */
 RequestUtil.prototype.shouldListObject = function (previousFetchTime, category) {
-  let currentTime = new Date().getTime()
+  const currentTime = new Date().getTime()
   return !previousFetchTime ||
       (currentTime - previousFetchTime) > parseInt(s3Helper.SQS_RETENTION, 10) * 1000 ||
       !CATEGORIES_FOR_SQS.includes(category) ||
@@ -325,8 +327,8 @@ RequestUtil.prototype.shouldListObject = function (previousFetchTime, category)
  * @returns {boolean}
  */
 RequestUtil.prototype.shouldRetireOldSQSQueue = function (createdTimestamp) {
-  let currentTime = new Date().getTime()
-  let newQueueCreatedTime =
+  const currentTime = new Date().getTime()
+  const newQueueCreatedTime =
     this.normalizeTimestampToMs(createdTimestamp, currentTime)
 
   return (currentTime - newQueueCreatedTime) > parseInt(s3Helper.SQS_RETENTION, 10) * 1000
@@ -430,7 +432,7 @@ RequestUtil.prototype.createAndSubscribeSQS = function (deviceId, deviceIdV2) {
 
   const subscribeOldSQSforCategory = function (deviceId, category, thisRef) {
     return new Promise((resolve, reject) => {
-      let params = {
+      const params = {
         QueueName: thisRef.sqsName(deviceId, category)
       }
       thisRef.sqs.getQueueUrl(params, (error, data) => {
@@ -470,7 +472,7 @@ RequestUtil.prototype.s3ObjectsToRecords = function (s3Objects) {
   this.missingObjectsCache.forEach((value, key, cache) => {
     partBuffer[key] = value
   })
-  for (let s3Object of s3Objects) {
+  for (const s3Object of s3Objects) {
     const parsedKey = s3Helper.parseS3Key(s3Object.Key)
     const fullCrc = parsedKey.recordCrc
     let data = parsedKey.recordPartString
@@ -491,7 +493,8 @@ RequestUtil.prototype.s3ObjectsToRecords = function (s3Objects) {
         decrypted = this.decrypt(dataBytes)
         decrypted.syncTimestamp = parsedKey.timestamp
         output.push(
-          { record: decrypted,
+          {
+            record: decrypted,
             objects: objectMap[fullCrc]
           })
       } catch (e) {
@@ -503,7 +506,7 @@ RequestUtil.prototype.s3ObjectsToRecords = function (s3Objects) {
       partBuffer[fullCrc] = data
     }
   }
-  for (let crc in partBuffer) {
+  for (const crc in partBuffer) {
     this.missingObjectsCache.set(crc, partBuffer[crc])
     console.log(`Record with CRC ${crc} is missing parts or corrupt.`)
   }
@@ -582,7 +585,7 @@ RequestUtil.prototype.compactObjects = function (s3Objects) {
 RequestUtil.prototype.s3PostFormData = function (objectKey) {
   let formData = new FormData() // eslint-disable-line
   formData.append('key', objectKey)
-  for (let key of Object.keys(this.postData)) {
+  for (const key of Object.keys(this.postData)) {
     formData.append(key, this.postData[key])
   }
   formData.append('file', new Uint8Array([]))
@@ -606,7 +609,7 @@ RequestUtil.prototype.deleteUser = function () {
 
 RequestUtil.prototype.purgeUserCategoryQueue = function (category) {
   return new Promise((resolve, reject) => {
-    let params = {
+    const params = {
       QueueName: this.sqsName(this.deviceIdV2, category)
     }
     this.sqs.getQueueUrl(params, (error, data) => {
@@ -615,7 +618,7 @@ RequestUtil.prototype.purgeUserCategoryQueue = function (category) {
         resolve([])
         // Just ignore the error
       } else if (data) {
-        let params = {
+        const params = {
           QueueUrl: data.QueueUrl
         }
         this.sqs.purgeQueue(params, (errPurgeSQS, dataPurgeSQS) => {
@@ -636,7 +639,7 @@ RequestUtil.prototype.purgeUserCategoryQueue = function (category) {
  */
 RequestUtil.prototype.deleteSQSQueue = function (url) {
   return new Promise((resolve, reject) => {
-    let params = {
+    const params = {
       QueueUrl: url
     }
     this.sqs.deleteQueue(params, (err, data) => {

client/sync.js

@@ -7,9 +7,9 @@ const recordUtil = require('./recordUtil')
 const messages = require('./constants/messages')
 const proto = require('./constants/proto')
 const serializer = require('../lib/serializer')
-const {deriveKeys, generateDeviceIdV2} = require('../lib/crypto')
+const { deriveKeys, generateDeviceIdV2 } = require('../lib/crypto')
 
-let ipc = window.chrome.ipcRenderer
+const ipc = window.chrome.ipcRenderer
 
 // logging
 const DEBUG = 0
@@ -95,8 +95,8 @@ const startSync = (requester) => {
    */
   const getJSRecords = (s3Objects, filterFunction) => {
     const recordObjects = requester.s3ObjectsToRecords(s3Objects)
-    let jsRecords = []
-    for (let recordObject of recordObjects) {
+    const jsRecords = []
+    for (const recordObject of recordObjects) {
       const record = recordObject.record
       const jsRecord = recordUtil.syncRecordAsJS(record)
       // Useful but stored in the S3 key.
@@ -142,8 +142,8 @@ const startSync = (requester) => {
     })
   })
   ipc.on(messages.FETCH_SYNC_DEVICES, (e) => {
-    logSync(`fetching devices`)
-    requester.list(proto.categories['PREFERENCES'], 0).then((s3Objects) => {
+    logSync('fetching devices')
+    requester.list(proto.categories.PREFERENCES, 0).then((s3Objects) => {
       const isDevice = (jsRecord) => !!jsRecord.device
       const jsRecords = getJSRecords(s3Objects.contents, isDevice)
       logSync(`fetched ${jsRecords.length} devices`)
@@ -162,7 +162,7 @@ const startSync = (requester) => {
     const sentRecords = []
     records.forEach((record) => {
       if (!record) {
-        logSync(`could not send empty record`, ERROR)
+        logSync('could not send empty record', ERROR)
         return
       }
       // Workaround #17
@@ -185,7 +185,7 @@ const startSync = (requester) => {
     })
   })
   ipc.on(messages.DELETE_SYNC_USER, (e) => {
-    logSync(`Deleting user!!`)
+    logSync('Deleting user!!')
     requester.deleteUser().then(() => {
       requester.purgeUserQueue().then(() => {
         ipc.send(messages.DELETED_SYNC_USER)
@@ -210,8 +210,8 @@ const startSync = (requester) => {
       isCompactionInProgress = false
     }
     const compactionUpdate = (records) => {
-      let jsRecords = []
-      for (let record of records) {
+      const jsRecords = []
+      for (const record of records) {
         const jsRecord = recordUtil.syncRecordAsJS(record)
         jsRecord.syncTimestamp = record.syncTimestamp
         jsRecords.push(jsRecord)
@@ -221,24 +221,24 @@ const startSync = (requester) => {
     }
     if (!isCompactionInProgress) {
       requester.list(proto.categories[category], 0, 1000, '', 0,
-        {compaction: true, compactionDoneCb: compactionDone, compactionUpdateCb: compactionUpdate}).then(() => {
+        { compaction: true, compactionDoneCb: compactionDone, compactionUpdateCb: compactionUpdate }).then(() => {
         logSync(`Compacting category: ${category}`)
         isCompactionInProgress = true
       })
     }
   })
   ipc.on(messages.DELETE_SYNC_SITE_SETTINGS, (e) => {
-    logSync(`Deleting siteSettings`)
+    logSync('Deleting siteSettings')
     requester.deleteSiteSettings().then(() => {
       requester.purgeUserQueue()
     })
   })
   ipc.on(messages.GET_BOOKMARKS_BASE_ORDER, (e, deviceId, platform) => {
-    logSync(`Getting bookmarks base order`)
+    logSync('Getting bookmarks base order')
     ipc.send(messages.SAVE_BOOKMARKS_BASE_ORDER, bookmarkUtil.getBaseBookmarksOrder(deviceId, platform))
   })
   ipc.on(messages.GET_BOOKMARK_ORDER, (e, prevOrder, nextOrder, parentOrder) => {
-    logSync(`Getting current bookmark order based on prev, next and parent orders`)
+    logSync('Getting current bookmark order based on prev, next and parent orders')
 
     ipc.send(messages.SAVE_BOOKMARK_ORDER, bookmarkUtil.getBookmarkOrder(prevOrder, nextOrder, parentOrder), prevOrder, nextOrder, parentOrder)
   })