wip

Author: daviddias

src/core/components/libp2p.js

@@ -15,27 +15,33 @@ module.exports = function libp2p (self) {
           return callback(err)
         }
 
-        const options = {
-          mdns: get(config, 'Discovery.MDNS.Enabled'),
-          webRTCStar: get(config, 'Discovery.webRTCStar.Enabled'),
-          bootstrap: get(config, 'Bootstrap'),
+        const libp2pOptions = {
+          peerInfo: self._peerInfo,
+          peerBook: self._peerInfoBook,
           modules: self._libp2pModules,
-          // EXPERIMENTAL
-          pubsub: get(self._options, 'EXPERIMENTAL.pubsub', false),
-          dht: get(self._options, 'EXPERIMENTAL.dht', false),
-          relay: {
-            enabled: get(self._options, 'EXPERIMENTAL.relay.enabled',
-              get(config, 'EXPERIMENTAL.relay.enabled', false)),
-            hop: {
-              enabled: get(self._options, 'EXPERIMENTAL.relay.hop.enabled',
-                get(config, 'EXPERIMENTAL.relay.hop.enabled', false)),
-              active: get(self._options, 'EXPERIMENTAL.relay.hop.active',
-                get(config, 'EXPERIMENTAL.relay.hop.active', false))
+          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),
+            relay: {
+              enabled: get(self._options, 'EXPERIMENTAL.relay.enabled',
+                get(config, 'EXPERIMENTAL.relay.enabled', false)),
+              hop: {
+                enabled: get(self._options, 'EXPERIMENTAL.relay.hop.enabled',
+                  get(config, 'EXPERIMENTAL.relay.hop.enabled', false)),
+                active: get(self._options, 'EXPERIMENTAL.relay.hop.active',
+                  get(config, 'EXPERIMENTAL.relay.hop.active', false))
+              }
             }
           }
         }
 
-        self._libp2pNode = new Node(self._peerInfo, self._peerInfoBook, options)
+        self._libp2pNode = new Node(libp2pOptions)
 
         self._libp2pNode.on('peer:discovery', (peerInfo) => {
           const dial = () => {

src/core/runtime/libp2p-nodejs.js

@@ -4,49 +4,63 @@ const TCP = require('libp2p-tcp')
 const MulticastDNS = require('libp2p-mdns')
 const WS = require('libp2p-websockets')
 const WebSocketStar = require('libp2p-websocket-star')
-const Railing = require('libp2p-railing')
+const Bootstrap = require('libp2p-railing')
 const KadDHT = require('libp2p-kad-dht')
 const Multiplex = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const libp2p = require('libp2p')
+const defaultsDeep = require('lodash.defaultsdeep')
 
 class Node extends libp2p {
-  constructor (peerInfo, peerBook, options) {
-    options = options || {}
-    const wsstar = new WebSocketStar({id: peerInfo.id})
+  constructor (_options) {
+    const wsstar = new WebSocketStar({id: _options.peerInfo.id})
+    const mdns = new MulticastDNS(_options.peerInfo, 'ipfs.local')
 
-    const modules = {
-      transport: [new TCP(), new WS(), wsstar],
-      connection: {
-        muxer: [Multiplex],
-        crypto: [SECIO]
+    const defaults = {
+      modules: {
+        transport: [
+          TCP,
+          WS
+        ],
+        streamMuxer: [
+          Multiplex
+        ],
+        connEncryption: [
+          SECIO
+        ],
+        peerDiscovery: [
+          MulticastDNS,
+          Bootstrap
+        ],
+        peerRouting: [],
+        contentRouting: [],
+        dht: KadDHT
       },
-      discovery: [wsstar.discovery]
-    }
-
-    if (options.dht) {
-      modules.DHT = KadDHT
-    }
-
-    if (options.mdns) {
-      const mdns = new MulticastDNS(peerInfo, 'ipfs.local')
-      modules.discovery.push(mdns)
-    }
-
-    if (options.bootstrap) {
-      const r = new Railing(options.bootstrap)
-      modules.discovery.push(r)
+      config: {
+        peerDiscovery: {
+          bootstrap: {
+            list: _options.bootstrapList
+          }
+        },
+        peerRouting: {},
+        contentRouting: {},
+        dht: {
+          kBucketSize: 20
+        }
+      },
+      EXPERIMENTAL: {
+        dht: false,
+        pubsub: false
+      }
     }
 
-    if (options.modules && options.modules.transport) {
-      options.modules.transport.forEach((t) => modules.transport.push(t))
-    }
+    defaultsDeep(_options, defaults)
 
-    if (options.modules && options.modules.discovery) {
-      options.modules.discovery.forEach((d) => modules.discovery.push(d))
-    }
+    _options.modules.transport.push(wsstar)
+    _options.modules.peerDiscovery.push(wsstar)
+    _options.modules.peerDiscovery.push(mdns)
 
-    super(modules, peerInfo, peerBook, options)
+    super(_options)
   }
 }