refactor: necromancy to restore build

- removed yarn and all the hackery around transitive dependency overrides
- bumped all dependencies
- switched to ipfs-core for less deps
- removed unused deps
- Firefox manifest fix to pass latest webext lint
- removed remaining window.ipfs code that was pulling dead dependencies
  (ipfs/in-web-browsers#172)

TODO:
- fix tests
- docker builds
- browserAction icon

.gitignore

@@ -1,6 +1,6 @@
 /vendor
 /node_modules
-/package-lock.json
+/yarn.lock
 /firefox
 /cache
 /build

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.15.4
+FROM node:16.13.1
 
 ARG USER_ID
 ARG GROUP_ID

add-on/_locales/en/messages.json

@@ -515,18 +515,6 @@
     "message": "Load items with x-ipfs-path headers over IPFS (instead of HTTP) if the header value is an IPFS path. To redirect IPNS paths as well, enable DNSLink support.",
     "description": "An option description on the Preferences screen (option_detectIpfsPathHeader_description)"
   },
-  "option_ipfsProxy_title": {
-    "message": "Support for window.ipfs",
-    "description": "An option title for enabling/disabling the IPFS proxy (option_ipfsProxy_title)"
-  },
-  "option_ipfsProxy_description": {
-    "message": "IPFS is added to the window object on every page. Enable/disable access to the functions it exposes.",
-    "description": "An option description for the IPFS proxy (option_ipfsProxy_description)"
-  },
-  "option_ipfsProxy_link_manage_permissions": {
-    "message": "Manage permissions",
-    "description": "Link text for managing permissions"
-  },
   "option_openViaWebUI_title": {
     "message": "Open Imported Files in the Files Screen",
     "description": "An option title on the Preferences screen (option_openViaWebUI_title)"

add-on/manifest.firefox.json

@@ -8,7 +8,7 @@
   "applications": {
     "gecko": {
       "id": "ipfs-firefox-addon@lidel.org",
-      "strict_min_version": "68.0"
+      "strict_min_version": "91.1.0"
     }
   },
   "permissions": [

add-on/src/lib/ipfs-client/embedded.js

@@ -5,7 +5,7 @@ const log = debug('ipfs-companion:client:embedded')
 log.error = debug('ipfs-companion:client:embedded:error')
 
 const mergeOptions = require('merge-options')
-const Ipfs = require('ipfs')
+const Ipfs = require('ipfs-core')
 const { optionDefaults } = require('../options')
 
 let node = null

add-on/src/lib/ipfs-client/external.js

@@ -5,13 +5,13 @@ const debug = require('debug')
 const log = debug('ipfs-companion:client:external')
 log.error = debug('ipfs-companion:client:external:error')
 
-const httpClient = require('ipfs-http-client')
+const { create } = require('ipfs-http-client')
 
 exports.init = async function (browser, opts) {
   log(`init with IPFS API at ${opts.apiURLString}`)
   const clientConfig = opts.apiURLString
   // https://github.com/ipfs/js-ipfs/tree/master/packages/ipfs-http-client#importing-the-module-and-usage
-  const api = httpClient(clientConfig)
+  const api = await create(clientConfig)
   return api
 }
 

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

@@ -23,7 +23,6 @@ const createCopier = require('./copier')
 const createInspector = require('./inspector')
 const { createRuntimeChecks } = require('./runtime-checks')
 const { createContextMenus, findValueForContext, contextMenuCopyAddressAtPublicGw, contextMenuCopyRawCid, contextMenuCopyCanonicalAddress, contextMenuViewOnGateway, contextMenuCopyPermalink, contextMenuCopyCidAddress } = require('./context-menus')
-const createIpfsProxy = require('./ipfs-proxy')
 const { registerSubdomainProxy } = require('./http-proxy')
 const { runPendingOnInstallTasks } = require('./on-installed')
 
@@ -44,8 +43,6 @@ module.exports = async function init () {
   let runtime
   let contextMenus
   let apiStatusUpdateInterval
-  let ipfsProxy
-  // TODO: window.ipfs var ipfsProxyContentScript
   let ipfsImportHandler
   const idleInSecs = 5 * 60
   const browserActionPortName = 'browser-action-port'
@@ -84,8 +81,6 @@ module.exports = async function init () {
       onCopyAddressAtPublicGw: copier.copyAddressAtPublicGw
     })
     modifyRequest = createRequestModifier(getState, dnslinkResolver, ipfsPathValidator, runtime)
-    ipfsProxy = createIpfsProxy(getIpfs, getState)
-    // TODO(window.ipfs) ipfsProxyContentScript = await registerIpfsProxyContentScript()
     log('register all listeners')
     registerListeners()
     await registerSubdomainProxy(getState, runtime, notify)
@@ -137,43 +132,6 @@ module.exports = async function init () {
     }
   }
 
-  // Register Content Script responsible for loading window.ipfs (ipfsProxy)
-  //
-  // The key difference between tabs.executeScript and contentScripts API
-  // is the latter provides guarantee to execute before anything else.
-  // https://github.com/ipfs-shipyard/ipfs-companion/issues/451#issuecomment-382669093
-  /* TODO(window.ipfs)
-  async function registerIpfsProxyContentScript (previousHandle) {
-    previousHandle = previousHandle || ipfsProxyContentScript
-    if (previousHandle) {
-      previousHandle.unregister()
-    }
-    // TODO:
-    // No window.ipfs for now.
-    // We will restore when Migration to JS API with Async Await and Async Iterables
-    // is done:
-    // https://github.com/ipfs-shipyard/ipfs-companion/pull/777
-    // https://github.com/ipfs-shipyard/ipfs-companion/issues/843
-    // https://github.com/ipfs-shipyard/ipfs-companion/issues/852#issuecomment-594510819
-    const forceOff = true
-    if (forceOff || !state.active || !state.ipfsProxy || !browser.contentScripts) {
-      // no-op if global toggle is off, window.ipfs is disabled in Preferences
-      // or if runtime has no contentScript API
-      // (Chrome loads content script via manifest)
-      return
-    }
-    const newHandle = await browser.contentScripts.register({
-      matches: ['<all_urls>'],
-      js: [
-        { file: '/dist/bundles/ipfsProxyContentScript.bundle.js' }
-      ],
-      allFrames: true,
-      runAt: 'document_start'
-    })
-    return newHandle
-  }
-  */
-
   // HTTP Request Hooks
   // ===================================================================
 
@@ -616,7 +574,6 @@ module.exports = async function init () {
       switch (key) {
         case 'active':
           state[key] = change.newValue
-          // TODO(window.ipfs) ipfsProxyContentScript = await registerIpfsProxyContentScript()
           await registerSubdomainProxy(getState, runtime)
           shouldRestartIpfsClient = true
           shouldStopIpfsClient = !state.active
@@ -671,12 +628,6 @@ module.exports = async function init () {
           // Finally, update proxy settings based on the state
           await registerSubdomainProxy(getState, runtime)
           break
-        /* TODO(window.ipfs)
-        case 'ipfsProxy':
-          state[key] = change.newValue
-          // This is window.ipfs proxy, requires update of the content script:
-          ipfsProxyContentScript = await registerIpfsProxyContentScript()
-          break */
         case 'dnslinkPolicy':
           state.dnslinkPolicy = String(change.newValue) === 'false' ? false : change.newValue
           if (state.dnslinkPolicy === 'best-effort' && !state.detectIpfsPathHeader) {
@@ -770,18 +721,6 @@ module.exports = async function init () {
         apiStatusUpdateInterval = null
       }
 
-      /* TODO(window.ipfs)
-      if (ipfsProxyContentScript) {
-        ipfsProxyContentScript.unregister()
-        ipfsProxyContentScript = null
-      }
-      */
-
-      if (ipfsProxy) {
-        await ipfsProxy.destroy()
-        ipfsProxy = null
-      }
-
       if (ipfs) {
         await destroyIpfsClient(browser)
         ipfs = null