refactor: remove embedded:chromesockets experiment

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
 
       - name: Restore .cache
         uses: actions/cache@v2

add-on/src/lib/dnslink.js

@@ -122,7 +122,6 @@ module.exports = function createDnslinkResolver (getState) {
     readDnslinkFromTxtRecord (fqdn) {
       const state = getState()
       let apiProvider
-      // TODO: fix DNS resolver for ipfsNodeType='embedded:chromesockets', for now use ipfs.io
       if (!state.ipfsNodeType.startsWith('embedded') && state.peerCount !== offlinePeerCount) {
         // Use gw port so it can be a GET:
         // Chromium does not execute onBeforeSendHeaders for synchronous calls

add-on/src/lib/http-proxy.js

@@ -64,7 +64,7 @@ async function registerSubdomainProxy (getState, runtime, notify) {
 }
 
 // storing listener for later
-var onRequestProxyListener
+let onRequestProxyListener
 
 // registerSubdomainProxyFirefox sets proxy using API available in Firefox
 // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/proxy/onRequest

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

@@ -200,6 +200,9 @@ async function initBraveSettings (browser, brave) {
   }
 
   if (method !== 'local') {
+    // user picked remote gateway mode, turn Companion off for now
+    // (this way clicking power button in browser action menu will re-run activation flow)
+    await browser.storage.local.set({ active: false })
     // close tab with temporary trigger URI
     await closeIpfsTab(browser, braveIpfsUriTrigger)
     await closeIpfsTab(browser, braveGatewayUrlTrigger)

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

@@ -9,7 +9,6 @@ log.error = debug('ipfs-companion:client:error')
 const external = require('./external')
 const embedded = require('./embedded')
 const brave = require('./brave')
-const embeddedWithChromeSockets = require('./embedded-chromesockets')
 const { precache } = require('../precache')
 
 // ensure single client at all times, and no overlap between init and destroy
@@ -20,12 +19,22 @@ async function initIpfsClient (browser, opts) {
   if (client) return // await destroyIpfsClient()
   let backend
   switch (opts.ipfsNodeType) {
+    case 'embedded:chromesockets':
+      // TODO: remove this one-time migration after in second half of 2021
+      setTimeout(async () => {
+        log('converting embedded:chromesockets to native external:brave')
+        opts.ipfsNodeType = 'external:brave'
+        await browser.storage.local.set({
+          ipfsNodeType: 'external:brave',
+          ipfsNodeConfig: '{}' // remove chrome-apps config
+        })
+        await browser.tabs.create({ url: 'https://docs.ipfs.io/how-to/companion-node-types/#native' })
+      }, 0)
+      // Halt client init
+      throw new Error('Embedded + chrome.sockets is deprecated. Switching to Native IPFS in Brave.')
     case 'embedded':
       backend = embedded
       break
-    case 'embedded:chromesockets':
-      backend = embeddedWithChromeSockets
-      break
     case 'external:brave':
       backend = brave
       break