fix: tweak new config for test success

License: MIT
Signed-off-by: Alan Shaw <[email protected]>

Author: alanshaw

package.json

@@ -61,7 +61,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^13.1.0",
+    "aegir": "^14.0.0",
     "buffer-loader": "~0.0.1",
     "chai": "^4.1.2",
     "delay": "^2.0.0",
@@ -125,14 +125,14 @@
     "joi": "^13.2.0",
     "joi-browser": "^13.0.1",
     "joi-multiaddr": "^2.0.0",
-    "libp2p": "~0.20.4",
+    "libp2p": "~0.21.0",
     "libp2p-circuit": "~0.2.0",
     "libp2p-floodsub": "~0.15.0",
     "libp2p-kad-dht": "~0.10.0",
     "libp2p-keychain": "~0.3.1",
-    "libp2p-mdns": "~0.11.0",
-    "libp2p-mplex": "~0.7.0",
-    "libp2p-railing": "~0.8.1",
+    "libp2p-mdns": "~0.12.0",
+    "libp2p-mplex": "~0.8.0",
+    "libp2p-railing": "~0.9.1",
     "libp2p-secio": "~0.10.0",
     "libp2p-tcp": "~0.12.0",
     "libp2p-webrtc-star": "~0.15.0",

src/core/components/libp2p.js

@@ -20,14 +20,20 @@ module.exports = function libp2p (self) {
           peerBook: self._peerInfoBook,
           modules: self._libp2pModules,
           config: {
-            mdns: get(config, 'Discovery.MDNS.Enabled'),
-            webRTCStar: get(config, 'Discovery.webRTCStar.Enabled'),
-            bootstrap: get(config, 'Bootstrap')
-          },
-          EXPERIMENTAL: {
-            // TODO move all of this to the config!
-            pubsub: get(self._options, 'EXPERIMENTAL.pubsub', false),
-            dht: get(self._options, 'EXPERIMENTAL.dht', false),
+            peerDiscovery: {
+              mdns: {
+                enabled: get(self._options, 'config.Discovery.MDNS.Enabled',
+                  get(config, 'Discovery.MDNS.Enabled', true))
+              },
+              webRTCStar: {
+                enabled: get(self._options, 'config.Discovery.webRTCStar.Enabled',
+                  get(config, 'Discovery.webRTCStar.Enabled', true))
+              },
+              bootstrap: {
+                list: get(self._options, 'config.Bootstrap',
+                  get(config, 'Bootstrap', []))
+              }
+            },
             relay: {
               enabled: get(self._options, 'EXPERIMENTAL.relay.enabled',
                 get(config, 'EXPERIMENTAL.relay.enabled', false)),
@@ -37,6 +43,10 @@ module.exports = function libp2p (self) {
                 active: get(self._options, 'EXPERIMENTAL.relay.hop.active',
                   get(config, 'EXPERIMENTAL.relay.hop.active', false))
               }
+            },
+            EXPERIMENTAL: {
+              dht: get(self._options, 'EXPERIMENTAL.dht', false),
+              pubsub: get(self._options, 'EXPERIMENTAL.pubsub', false)
             }
           }
         }

src/core/runtime/libp2p-browser.js

@@ -5,38 +5,55 @@ const WebRTCStar = require('libp2p-webrtc-star')
 const WebSocketStar = require('libp2p-websocket-star')
 const Multiplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
-const Railing = require('libp2p-railing')
+const Bootstrap = require('libp2p-railing')
 const libp2p = require('libp2p')
+const defaultsDeep = require('lodash.defaultsdeep')
 
 class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
-    options = options || {}
-    const wrtcstar = new WebRTCStar({id: peerInfo.id})
-    const wsstar = new WebSocketStar({id: peerInfo.id})
-
-    const modules = {
-      transport: [new WS(), wrtcstar, wsstar],
-      connection: {
-        muxer: [Multiplex],
-        crypto: [SECIO]
+  constructor (_options) {
+    const wrtcstar = new WebRTCStar({id: _options.peerInfo.id})
+    const wsstar = new WebSocketStar({id: _options.peerInfo.id})
+
+    const defaults = {
+      modules: {
+        transport: [
+          WS,
+          wrtcstar,
+          wsstar
+        ],
+        streamMuxer: [
+          Multiplex
+        ],
+        connEncryption: [
+          SECIO
+        ],
+        peerDiscovery: [
+          wrtcstar.discovery,
+          wsstar.discovery,
+          Bootstrap
+        ]
       },
-      discovery: [wrtcstar.discovery, wsstar.discovery]
-    }
-
-    if (options.bootstrap) {
-      const r = new Railing(options.bootstrap)
-      modules.discovery.push(r)
-    }
-
-    if (options.modules && options.modules.transport) {
-      options.modules.transport.forEach((t) => modules.transport.push(t))
-    }
-
-    if (options.modules && options.modules.discovery) {
-      options.modules.discovery.forEach((d) => modules.discovery.push(d))
+      config: {
+        peerDiscovery: {
+          bootstrap: {
+            enabled: true
+          },
+          webRTCStar: {
+            enabled: true
+          },
+          websocketStar: {
+            enabled: true
+          }
+        },
+        EXPERIMENTAL: {
+          dht: false,
+          pubsub: false
+        }
+      }
     }
 
-    super(modules, peerInfo, peerBook, options)
+    defaultsDeep(_options, defaults)
+    super(_options)
   }
 }
 

src/core/runtime/libp2p-nodejs.js

@@ -14,13 +14,13 @@ const defaultsDeep = require('lodash.defaultsdeep')
 class Node extends libp2p {
   constructor (_options) {
     const wsstar = new WebSocketStar({id: _options.peerInfo.id})
-    const mdns = new MulticastDNS(_options.peerInfo, 'ipfs.local')
 
     const defaults = {
       modules: {
         transport: [
           TCP,
-          WS
+          WS,
+          wsstar
         ],
         streamMuxer: [
           Multiplex
@@ -30,36 +30,34 @@ class Node extends libp2p {
         ],
         peerDiscovery: [
           MulticastDNS,
-          Bootstrap
+          Bootstrap,
+          wsstar.discovery
         ],
-        peerRouting: [],
-        contentRouting: [],
         dht: KadDHT
       },
       config: {
         peerDiscovery: {
+          mdns: {
+            enabled: true
+          },
           bootstrap: {
-            list: _options.bootstrapList
+            enabled: true
+          },
+          websocketStar: {
+            enabled: true
           }
         },
-        peerRouting: {},
-        contentRouting: {},
         dht: {
           kBucketSize: 20
+        },
+        EXPERIMENTAL: {
+          dht: false,
+          pubsub: false
         }
-      },
-      EXPERIMENTAL: {
-        dht: false,
-        pubsub: false
       }
     }
 
     defaultsDeep(_options, defaults)
-
-    _options.modules.transport.push(wsstar)
-    _options.modules.peerDiscovery.push(wsstar)
-    _options.modules.peerDiscovery.push(mdns)
-
     super(_options)
   }
 }