chore: update to standard 13

code changes to follow new rules:
https://github.com/standard/standard/blob/master/CHANGELOG.md#1300---2019-07-10

Author: lidel

add-on/src/contentScripts/ipfs-proxy/page.js

@@ -32,8 +32,8 @@ function createWindowIpfs () {
   const proxyClient = createProxyClient()
 
   // Add deprecation warning to window.ipfs.<cmd>
-  for (let cmd in proxyClient) {
-    let fn = proxyClient[cmd]
+  for (const cmd in proxyClient) {
+    const fn = proxyClient[cmd]
     proxyClient[cmd] = function () {
       console.warn('Calling commands directly on window.ipfs is deprecated and will be removed on 2019-09-01. Use API instance returned by window.ipfs.enable() instead. More: https://github.com/ipfs-shipyard/ipfs-companion/blob/master/docs/window.ipfs.md')
       return fn.apply(this, arguments)

add-on/src/contentScripts/linkifyDOM.js

@@ -65,7 +65,7 @@ const { default: PQueue } = require('p-queue')
   async function linkifyMutation (mutation, linkifyJobs) {
     linkifyJobs = linkifyJobs || new PQueue({ concurrency: 1 })
     if (mutation.type === 'childList') {
-      for (let addedNode of mutation.addedNodes) {
+      for (const addedNode of mutation.addedNodes) {
         if (addedNode.nodeType === Node.TEXT_NODE) {
           linkifyJobs.add(async () => linkifyTextNode(addedNode))
         } else {

add-on/src/contentScripts/normalizeLinksWithUnhandledProtocols.js

@@ -38,7 +38,7 @@
     new MutationObserver(function (mutations) {
       mutations.forEach(function (mutation) {
         if (mutation.type === 'childList') {
-          for (let addedNode of mutation.addedNodes) {
+          for (const addedNode of mutation.addedNodes) {
             if (addedNode.nodeType === Node.ELEMENT_NODE) {
               setTimeout(() => normalizeTree(addedNode), 0)
             }

add-on/src/lib/context-menus.js

@@ -173,13 +173,13 @@ function createContextMenus (getState, runtime, ipfsPathValidator, { onAddFromCo
           }
         }
         const ifApi = getState().peerCount > 0
-        for (let item of apiMenuItems) {
+        for (const item of apiMenuItems) {
           await browser.contextMenus.update(item, { enabled: ifApi })
         }
-        for (let item of ipfsContextItems) {
+        for (const item of ipfsContextItems) {
           await browser.contextMenus.update(item, { enabled: ipfsContext })
         }
-        for (let item of apiAndIpfsContextItems) {
+        for (const item of apiAndIpfsContextItems) {
           await browser.contextMenus.update(item, { enabled: (ifApi && ipfsContext) })
         }
       } catch (err) {

add-on/src/lib/ipfs-companion.js

@@ -96,7 +96,7 @@ module.exports = async function init () {
   }
 
   function registerListeners () {
-    let onBeforeSendInfoSpec = ['blocking', 'requestHeaders']
+    const onBeforeSendInfoSpec = ['blocking', 'requestHeaders']
     if (!runtime.isFirefox) {
       // Chrome 72+  requires 'extraHeaders' for access to Referer header (used in cors whitelisting of webui)
       onBeforeSendInfoSpec.push('extraHeaders')
@@ -230,7 +230,7 @@ module.exports = async function init () {
       currentTab: await browser.tabs.query({ active: true, currentWindow: true }).then(tabs => tabs[0])
     }
     try {
-      let v = await ipfs.version()
+      const v = await ipfs.version()
       if (v) {
         info.gatewayVersion = v.commit ? v.version + '/' + v.commit : v.version
       }
@@ -321,7 +321,7 @@ module.exports = async function init () {
         notify('notify_uploadErrorTitle', 'notify_uploadTrackingProtectionErrorMsg')
         console.warn('IPFS upload often fails because remote file can not be downloaded due to Tracking Protection. See details at: https://github.com/ipfs/ipfs-companion/issues/227')
         browser.tabs.create({
-          'url': 'https://github.com/ipfs/ipfs-companion/issues/227'
+          url: 'https://github.com/ipfs/ipfs-companion/issues/227'
         })
       } else {
         notify('notify_uploadErrorTitle', 'notify_inlineErrorMsg', `${error.message}`)
@@ -345,15 +345,15 @@ module.exports = async function init () {
   }
 
   async function uploadResultHandler ({ result, openRootInNewTab = false }) {
-    for (let file of result) {
+    for (const file of result) {
       if (file && file.hash) {
         const { path, url } = getIpfsPathAndNativeAddress(file.hash)
         preloadAtPublicGateway(path)
         console.info('[ipfs-companion] successfully stored', file)
         // open the wrapping directory (or the CID if wrapping was disabled)
         if (openRootInNewTab && (result.length === 1 || file.path === '' || file.path === file.hash)) {
           await browser.tabs.create({
-            'url': url
+            url: url
           })
         }
       }
@@ -464,7 +464,7 @@ module.exports = async function init () {
 
   async function apiStatusUpdate () {
     // update peer count
-    let oldPeerCount = state.peerCount
+    const oldPeerCount = state.peerCount
     state.peerCount = await getSwarmPeerCount()
     updatePeerCountDependentStates(oldPeerCount, state.peerCount)
     // trigger pending updates
@@ -535,7 +535,7 @@ module.exports = async function init () {
   }
 
   async function setBrowserActionIcon (iconPath) {
-    let iconDefinition = { path: iconPath }
+    const iconDefinition = { path: iconPath }
     try {
       // Try SVG first -- Firefox supports it natively
       await browser.browserAction.setIcon(iconDefinition)
@@ -553,17 +553,17 @@ module.exports = async function init () {
     // - https://bugs.chromium.org/p/chromium/issues/detail?id=647182
     // - https://developer.chrome.com/extensions/manifest/icons
     return {
-      'path': {
-        '19': rasterIconPath(svgPath, 19),
-        '38': rasterIconPath(svgPath, 38),
-        '128': rasterIconPath(svgPath, 128)
+      path: {
+        19: rasterIconPath(svgPath, 19),
+        38: rasterIconPath(svgPath, 38),
+        128: rasterIconPath(svgPath, 128)
       }
     }
   }
 
   function rasterIconPath (iconPath, size) {
     // point at precomputed PNG file
-    let baseName = /\/icons\/(.+)\.svg/.exec(iconPath)[1]
+    const baseName = /\/icons\/(.+)\.svg/.exec(iconPath)[1]
     return `/icons/png/${baseName}_${size}.png`
   }
 
@@ -602,7 +602,7 @@ module.exports = async function init () {
     let shouldRestartIpfsClient = false
     let shouldStopIpfsClient = false
 
-    for (let key in changes) {
+    for (const key in changes) {
       const change = changes[key]
       if (change.oldValue === change.newValue) continue
 
@@ -729,7 +729,7 @@ module.exports = async function init () {
     },
 
     destroy () {
-      let destroyTasks = []
+      const destroyTasks = []
       clearInterval(apiStatusUpdateInterval)
       apiStatusUpdateInterval = null
       ipfs = null

add-on/src/lib/ipfs-proxy/enable-command.js

@@ -21,16 +21,16 @@ function createEnableCommand (getIpfs, getState, getScope, accessControl, reques
     // Validate and prompt for any missing permissions in bulk
     // if a list of needed commands is announced up front
     if (opts.commands) {
-      let missingAcls = []
-      let deniedAcls = []
-      for (let command of opts.commands) {
+      const missingAcls = []
+      const deniedAcls = []
+      for (const command of opts.commands) {
         // Fail fast if command is not allowed to be proxied at all
         if (!inCommandWhitelist(command)) {
           throw createCommandWhitelistError(command)
         }
         // Get the current access flag to decide if it should be added
         // to the list of permissions to be prompted about in the next step
-        let access = await accessControl.getAccess(scope, command)
+        const access = await accessControl.getAccess(scope, command)
         if (!access) {
           missingAcls.push(command)
         } else if (access.allow !== true) {
@@ -44,7 +44,7 @@ function createEnableCommand (getIpfs, getState, getScope, accessControl, reques
       // Display a single prompt with all missing permissions
       if (missingAcls.length) {
         const { allow, wildcard } = await requestAccess(scope, missingAcls)
-        let access = await accessControl.setAccess(scope, wildcard ? '*' : missingAcls, allow)
+        const access = await accessControl.setAccess(scope, wildcard ? '*' : missingAcls, allow)
         if (!access.allow) {
           throw createProxyAclError(scope, missingAcls)
         }

add-on/src/lib/ipfs-request.js

@@ -45,7 +45,7 @@ function createRequestModifier (getState, dnslinkResolver, ipfsPathValidator, ru
     // To reconstruct originUrl we read full URL from Referer header in onBeforeSendHeaders
     // and cache it for short time
     // TODO: when request.originUrl is available in Chrome the `originUrls` cache can be removed
-    let cachedUrl = originUrls.get(request.requestId)
+    const cachedUrl = originUrls.get(request.requestId)
     if (cachedUrl) return cachedUrl
     if (request.requestHeaders) {
       const referer = request.requestHeaders.find(h => h.name === 'Referer')
@@ -230,7 +230,7 @@ function createRequestModifier (getState, dnslinkResolver, ipfsPathValidator, ru
           let addExpectHeader = true
           const expectHeader = { name: 'Expect', value: '100-continue' }
           const warningMsg = 'Executing "Expect: 100-continue" workaround for ipfs.add due to https://github.com/ipfs/go-ipfs/issues/5168'
-          for (let header of request.requestHeaders) {
+          for (const header of request.requestHeaders) {
             // Workaround A: https://github.com/ipfs/go-ipfs/issues/5168#issuecomment-401417420
             // (works in Firefox, but Chromium does not expose Connection header)
             /* (disabled so we use the workaround B in all browsers)
@@ -335,7 +335,7 @@ function createRequestModifier (getState, dnslinkResolver, ipfsPathValidator, ru
         const notActiveGatewayOrApi = !(url.startsWith(state.pubGwURLString) || url.startsWith(state.gwURLString) || url.startsWith(state.apiURLString))
         if (state.detectIpfsPathHeader && request.responseHeaders && notActiveGatewayOrApi) {
           // console.log('onHeadersReceived.request', request)
-          for (let header of request.responseHeaders) {
+          for (const header of request.responseHeaders) {
             if (header.name.toLowerCase() === 'x-ipfs-path' && isSafeToRedirect(request, runtime)) {
               // console.log('onHeadersReceived.request.responseHeaders', request.responseHeaders.length)
               const xIpfsPath = header.value

add-on/src/lib/options.js

@@ -45,7 +45,7 @@ function buildDefaultIpfsNodeType () {
 }
 
 function buildDefaultIpfsNodeConfig () {
-  let config = {
+  const config = {
     config: {
       Addresses: {
         Swarm: []
@@ -88,11 +88,12 @@ function buildDefaultIpfsNodeConfig () {
 exports.storeMissingOptions = async (read, defaults, storage) => {
   const requiredKeys = Object.keys(defaults)
   const changes = {}
-  for (let key of requiredKeys) {
+  const has = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key)
+  for (const key of requiredKeys) {
     // limit work to defaults and missing values, skip values other than defaults
-    if (!read.hasOwnProperty(key) || read[key] === defaults[key]) {
+    if (!has(read, key) || read[key] === defaults[key]) {
       const data = await storage.get(key)
-      if (!data.hasOwnProperty(key)) { // detect and fix key without value in storage
+      if (!has(data, key)) { // detect and fix key without value in storage
         changes[key] = defaults[key]
       }
     }

add-on/src/popup/browser-action/store.js

@@ -167,7 +167,7 @@ module.exports = (state, emitter) => {
     try {
       let noRedirectHostnames = state.noRedirectHostnames
       // if we are on /ipns/fqdn.tld/ then use hostname from DNSLink
-      let fqdn = state.currentDnslinkFqdn || state.currentFqdn
+      const fqdn = state.currentDnslinkFqdn || state.currentFqdn
       if (noRedirectHostnames.includes(fqdn)) {
         noRedirectHostnames = noRedirectHostnames.filter(host => !host.endsWith(fqdn))
       } else {

add-on/src/popup/quick-upload.js

@@ -61,7 +61,7 @@ async function processFiles (state, emitter, files) {
     }
     const { ipfsCompanion } = await browser.runtime.getBackgroundPage()
     const uploadTab = await browser.tabs.getCurrent()
-    let { streams, totalSize } = files2streams(files)
+    const { streams, totalSize } = files2streams(files)
     progressHandler(0, totalSize, state, emitter)
     emitter.emit('render')
     const wrapFlag = (state.wrapWithDirectory || streams.length > 1)
@@ -113,7 +113,7 @@ function file2buffer (file) {
 function files2streams (files) {
   const streams = []
   let totalSize = 0
-  for (let file of files) {
+  for (const file of files) {
     if (!file.type && file.size === 0) {
       // UX fail-safe:
       // at the moment drag&drop of an empty file without an extension

package.json

@@ -99,7 +99,7 @@
     "simple-progress-webpack-plugin": "1.1.2",
     "sinon": "7.3.2",
     "sinon-chrome": "3.0.1",
-    "standard": "12.0.1",
+    "standard": "13.0.2",
     "tar": "4.4.10",
     "terser": "4.1.2",
     "terser-webpack-plugin": "1.3.0",

test/functional/lib/ipfs-companion.test.js

@@ -38,7 +38,7 @@ describe('init', function () {
     browser.storage.local.set.returns(Promise.resolve())
     const ipfsCompanion = await init()
     const { movedFilesApis } = require('../../../add-on/src/lib/ipfs-client/index.js')
-    for (let cmd of movedFilesApis) {
+    for (const cmd of movedFilesApis) {
       expect(typeof ipfsCompanion.ipfs[cmd], `ipfs.${cmd} expected to be a function`).to.equal('function')
       expect(typeof ipfsCompanion.ipfs.files[cmd], `ipfs.files.${cmd} expected to be a function`).to.equal('function')
     }

test/functional/lib/ipfs-protocol.test.js

@@ -11,12 +11,8 @@ describe('ipfs-protocol', () => {
     const handler = createIpfsUrlProtocolHandler(() => ipfs)
     const request = { url }
 
-    const res = await new Promise(async (resolve, reject) => {
-      try {
-        await handler(request, resolve)
-      } catch (err) {
-        reject(err)
-      }
+    const res = await new Promise((resolve, reject) => {
+      handler(request, resolve).catch((err) => reject(err))
     })
 
     expect(res.data).to.equal(content)
@@ -36,12 +32,8 @@ describe('ipfs-protocol', () => {
     const handler = createIpfsUrlProtocolHandler(() => ipfs)
     const request = { url }
 
-    const res = await new Promise(async (resolve, reject) => {
-      try {
-        await handler(request, resolve)
-      } catch (err) {
-        reject(err)
-      }
+    const res = await new Promise((resolve, reject) => {
+      handler(request, resolve).catch((err) => reject(err))
     })
 
     expect(res.mimeType).to.equal('text/html')

test/functional/lib/ipfs-proxy/enable-command.test.js

@@ -84,7 +84,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
     await enable(permissions)
 
     expect(requestAccess.called).to.equal(true)
-    let { allow } = await accessControl.getAccess(getScope(), 'version')
+    const { allow } = await accessControl.getAccess(getScope(), 'version')
     expect(allow).to.equal(true)
   })
 
@@ -99,13 +99,13 @@ describe('lib/ipfs-proxy/enable-command', () => {
 
     // ensure partial grant exists
     await accessControl.setAccess(getScope(), 'id', true)
-    let idAcl = await accessControl.getAccess(getScope(), 'id')
+    const idAcl = await accessControl.getAccess(getScope(), 'id')
     expect(idAcl.allow).to.equal(true)
 
     await enable(permissions)
 
     expect(requestAccess.called).to.equal(true)
-    let versionAcl = await accessControl.getAccess(getScope(), 'version')
+    const versionAcl = await accessControl.getAccess(getScope(), 'version')
     expect(versionAcl.allow).to.equal(true)
   })
 
@@ -120,7 +120,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
 
     // ensure partial deny exists
     await accessControl.setAccess(getScope(), 'id', false)
-    let idAcl = await accessControl.getAccess(getScope(), 'id')
+    const idAcl = await accessControl.getAccess(getScope(), 'id')
     expect(idAcl.allow).to.equal(false)
 
     // main test
@@ -136,7 +136,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
     expect(() => { if (error) throw error }).to.throw(`User denied access to selected commands over IPFS proxy: id`)
 
     // ensure explicit version acl is still missing
-    let versionAcl = await accessControl.getAccess(getScope(), 'version')
+    const versionAcl = await accessControl.getAccess(getScope(), 'version')
     expect(versionAcl).to.equal(null)
   })
 

test/functional/lib/ipfs-request-workarounds.test.js

@@ -19,7 +19,7 @@ describe('modifyRequest processing', function () {
     // stub URL.origin in test context to return something other than null
     Object.defineProperty(URL.prototype, 'origin', {
       get: function () {
-        let fakeOrigin = this.href.split('/')
+        const fakeOrigin = this.href.split('/')
         if (fakeOrigin.length >= 3) {
           return fakeOrigin.slice(0, 3).join('/')
         }
@@ -65,7 +65,7 @@ describe('modifyRequest processing', function () {
       // test
       const bogusOriginHeader = { name: 'Origin', value: 'moz-extension://0f334731-19e3-42f8-85e2-03dbf50026df' }
       const request = {
-        requestHeaders: [ bogusOriginHeader ],
+        requestHeaders: [bogusOriginHeader],
         type: 'xmlhttprequest',
         url: `${state.apiURLString}api/v0/id`
       }
@@ -85,7 +85,7 @@ describe('modifyRequest processing', function () {
       // test
       const bogusOriginHeader = { name: 'Origin', value: 'chrome-extension://trolrorlrorlrol' }
       const request = {
-        requestHeaders: [ bogusOriginHeader ],
+        requestHeaders: [bogusOriginHeader],
         type: 'xmlhttprequest',
         url: `${state.apiURLString}api/v0/id`
       }
@@ -105,7 +105,7 @@ describe('modifyRequest processing', function () {
       // test
       const bogusOriginHeader = { name: 'Origin', value: 'null' }
       const request = {
-        requestHeaders: [ bogusOriginHeader ],
+        requestHeaders: [bogusOriginHeader],
         type: 'xmlhttprequest',
         url: `${state.apiURLString}api/v0/id`
       }
@@ -131,7 +131,7 @@ describe('modifyRequest processing', function () {
 
       // Test request
       let request = {
-        requestHeaders: [ webuiOriginHeader, webuiRefererHeader, acrhHeader ],
+        requestHeaders: [webuiOriginHeader, webuiRefererHeader, acrhHeader],
         type: 'xmlhttprequest',
         originUrl: state.webuiRootUrl,
         url: `${state.apiURLString}api/v0/id`