refactor: DRY way of customizing libp2p bundle

This is PoC use of ipfs/js-ipfs#2591

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

@@ -3,15 +3,26 @@
 const browser = require('webextension-polyfill')
 
 const { optionDefaults } = require('../../options')
-const chromeSocketsBundle = require('./libp2p-bundle')
 const mergeOptions = require('merge-options')
 const getPort = require('get-port')
 const { getIPv4, getIPv6 } = require('webrtc-ips')
 
+const Libp2p = require('libp2p')
+const WebSocketStarMulti = require('libp2p-websocket-star-multi')
+const WebRTCStar = require('libp2p-webrtc-star')
+const WS = require('libp2p-websockets')
+const TCP = require('libp2p-tcp')
+const Bootstrap = require('libp2p-bootstrap')
+const MulticastDNS = require('libp2p-mdns')
+
 const multiaddr = require('multiaddr')
 const maToUri = require('multiaddr-to-uri')
 const multiaddr2httpUrl = (ma) => maToUri(ma.includes('/http') ? ma : multiaddr(ma).encapsulate('/http'))
 
+const debug = require('debug')
+const log = debug('ipfs-companion:client:embedded:config')
+log.error = debug('ipfs-companion:client:embedded:config:error')
+
 // additional default js-ipfs config specific to runtime with chrome.sockets APIs
 const chromeDefaultOpts = {
   config: {
@@ -113,7 +124,36 @@ async function buildConfig (opts, log) {
   // merge configs
   const finalOpts = {
     start: false,
-    libp2p: chromeSocketsBundle
+    libp2p: ({ libp2pOptions, peerInfo }) => {
+      const wrtcstar = new WebRTCStar({ id: peerInfo.id })
+
+      // TODO: provisional reset in case the same code run already in js-ipfs/src/core/runtime/libp2p-browser.js
+      peerInfo.multiaddrs.replace('/p2p-websocket-star', chromeDefaultOpts.config.Addresses.Swarm.find(addr => addr.includes('p2p-websocket-star')))
+
+      // this can be replaced once optional listening is supported with the below code. ref: https://github.com/libp2p/interface-transport/issues/41
+      // const wsstar = new WebSocketStar({ id: _options.peerInfo.id, ignore_no_online: true })
+      const wsstarServers = peerInfo.multiaddrs.toArray().map(String).filter(addr => addr.includes('p2p-websocket-star') && !addr.startsWith('/p2p-websocket-star'))
+      log('ws-star servers', wsstarServers)
+      peerInfo.multiaddrs.replace(wsstarServers.map(multiaddr), '/p2p-websocket-star') // the ws-star-multi module will replace this with the chosen ws-star servers
+      const wsstar = new WebSocketStarMulti({ servers: wsstarServers, id: peerInfo.id, ignore_no_online: true }) // allow scenario when all ws-stars are offline
+
+      libp2pOptions.modules.transport = [
+        TCP,
+        WS,
+        wrtcstar,
+        wsstar
+      ]
+
+      libp2pOptions.modules.peerDiscovery = [
+        wrtcstar.discovery,
+        wsstar.discovery,
+        MulticastDNS,
+        Bootstrap
+      ]
+
+      log('initializing libp2p with libp2pOptions', libp2pOptions)
+      return new Libp2p(libp2pOptions)
+    }
   }
   const ipfsNodeConfig = mergeOptions(defaultOpts, userOpts, chromeOpts, finalOpts)
 

package.json

@@ -133,7 +133,7 @@
     "get-port": "5.0.0",
     "http-dns": "3.0.1",
     "http-node": "1.2.0",
-    "ipfs": "https://github.com/ipfs/js-ipfs/tarball/b6505c1f2eda09c398af101954e6334c200b5587/js-ipfs.tar.gz",
+    "ipfs": "https://github.com/ipfs/js-ipfs/tarball/b9534c3a55705aadf966e57aa1ea46a14aa92d99/js-ipfs.tar.gz",
     "ipfs-css": "0.13.1",
     "ipfs-http-client": "39.0.1",
     "ipfs-http-response": "0.4.0",