fix: issue #905 (#906)

Author: daviddias

examples/transfer-files/package-lock.json

@@ -32,9 +32,7 @@ function start () {
   if (!node) {
     updateView('starting', node)
 
-    node = new self.Ipfs({
-      repo: 'ipfs-' + Math.random()
-    })
+    node = new self.Ipfs({repo: 'ipfs-' + Math.random()})
 
     node.on('start', () => {
       node.id().then((id) => {

examples/transfer-files/public/js/app.js

@@ -8,7 +8,7 @@
   "main": "src/core/index.js",
   "browser": {
     "./src/core/components/init-assets.js": false,
-    "./src/core/runtime/config-nodejs.js": "./src/core/runtime/config-browser.js",
+    "./src/core/runtime/config-nodejs.json": "./src/core/runtime/config-browser.json",
     "./src/core/runtime/libp2p-nodejs.js": "./src/core/runtime/libp2p-browser.js",
     "./src/core/runtime/repo-nodejs.js": "./src/core/runtime/repo-browser.js",
     "./test/utils/create-repo-nodejs.js": "./test/utils/create-repo-browser.js",
@@ -118,7 +118,6 @@
     "libp2p-multiplex": "^0.4.3",
     "libp2p-railing": "^0.5.1",
     "libp2p-secio": "^0.6.8",
-    "libp2p-spdy": "^0.10.6",
     "libp2p-swarm": "^0.29.1",
     "libp2p-tcp": "^0.10.1",
     "libp2p-webrtc-star": "^0.11.0",

package.json

@@ -2,57 +2,23 @@
 
 const WS = require('libp2p-websockets')
 const WebRTCStar = require('libp2p-webrtc-star')
-const spdy = require('libp2p-spdy')
-const multiplex = require('libp2p-multiplex')
-const secio = require('libp2p-secio')
+const Multiplex = require('libp2p-multiplex')
+const SECIO = require('libp2p-secio')
 const Railing = require('libp2p-railing')
 const libp2p = require('libp2p')
 
-function mapMuxers (list) {
-  return list.map((pref) => {
-    if (typeof pref !== 'string') {
-      return pref
-    }
-    switch (pref.trim().toLowerCase()) {
-      case 'spdy':
-        return spdy
-      case 'multiplex':
-        return multiplex
-      default:
-        throw new Error(pref + ' muxer not available')
-    }
-  })
-}
-
-function getMuxers (options) {
-  if (options) {
-    return mapMuxers(options)
-  } else {
-    return [multiplex, spdy]
-  }
-}
-
 class Node extends libp2p {
   constructor (peerInfo, peerBook, options) {
     options = options || {}
-    const webRTCStar = new WebRTCStar()
+    const wstar = new WebRTCStar()
 
     const modules = {
-      transport: [
-        new WS(),
-        webRTCStar
-      ],
+      transport: [new WS(), wstar],
       connection: {
-        muxer: getMuxers(options.muxer),
-        crypto: [
-          secio
-        ]
+        muxer: [Multiplex],
+        crypto: [SECIO]
       },
-      discovery: []
-    }
-
-    if (options.webRTCStar) {
-      modules.discovery.push(webRTCStar.discovery)
+      discovery: [wstar.discovery]
     }
 
     if (options.bootstrap) {

src/core/runtime/libp2p-browser.js

@@ -4,49 +4,20 @@ const TCP = require('libp2p-tcp')
 const MulticastDNS = require('libp2p-mdns')
 const WS = require('libp2p-websockets')
 const Railing = require('libp2p-railing')
-const spdy = require('libp2p-spdy')
 const KadDHT = require('libp2p-kad-dht')
-const multiplex = require('libp2p-multiplex')
-const secio = require('libp2p-secio')
+const Multiplex = require('libp2p-multiplex')
+const SECIO = require('libp2p-secio')
 const libp2p = require('libp2p')
 
-function mapMuxers (list) {
-  return list.map((pref) => {
-    if (typeof pref !== 'string') {
-      return pref
-    }
-    switch (pref.trim().toLowerCase()) {
-      case 'spdy': return spdy
-      case 'multiplex': return multiplex
-      default:
-        throw new Error(pref + ' muxer not available')
-    }
-  })
-}
-
-function getMuxers (muxers) {
-  const muxerPrefs = process.env.LIBP2P_MUXER
-  if (muxerPrefs && !muxers) {
-    return mapMuxers(muxerPrefs.split(','))
-  } else if (muxers) {
-    return mapMuxers(muxers)
-  } else {
-    return [multiplex, spdy]
-  }
-}
-
 class Node extends libp2p {
   constructor (peerInfo, peerBook, options) {
     options = options || {}
 
     const modules = {
-      transport: [
-        new TCP(),
-        new WS()
-      ],
+      transport: [new TCP(), new WS()],
       connection: {
-        muxer: getMuxers(options.muxer),
-        crypto: [ secio ]
+        muxer: [Multiplex],
+        crypto: [SECIO]
       },
       discovery: []
     }