diff --git a/examples/transfer-files/package-lock.json b/examples/transfer-files/package-lock.json deleted file mode 100644 index fdc396685f..0000000000 --- a/examples/transfer-files/package-lock.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "name": "transfer-files", - "version": "1.0.0", - "lockfileVersion": 1, - "dependencies": { - "async": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz", - "integrity": "sha1-rDYTsdqb7RtHUQu0ZRuJMeRxRsc=", - "dev": true - }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "dev": true - }, - "corser": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz", - "integrity": "sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=", - "dev": true - }, - "ecstatic": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-1.4.1.tgz", - "integrity": "sha1-Mst7b6LikNWGaGdNEV6PDD1WfWo=", - "dev": true - }, - "eventemitter3": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", - "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=", - "dev": true - }, - "he": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/he/-/he-0.5.0.tgz", - "integrity": "sha1-LAX/rvkLaOhg8/0rVO9YCYknfuI=", - "dev": true - }, - "http-proxy": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", - "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=", - "dev": true - }, - "http-server": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/http-server/-/http-server-0.9.0.tgz", - "integrity": "sha1-jxsGvcczYY1NxCgxx7oa/04GABo=", - "dev": true - }, - "mime": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", - "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=", - "dev": true - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } - } - }, - "opener": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz", - "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=", - "dev": true - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - } - } - }, - "portfinder": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.4.0.tgz", - "integrity": "sha1-o/+t/6/k+5jgYBqF7aJ8J86Eyh4=", - "dev": true - }, - "qs": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz", - "integrity": "sha1-6eha2+ddoLvkyOBHaghikPhjtAQ=", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true - }, - "union": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/union/-/union-0.4.6.tgz", - "integrity": "sha1-GY+9rrolTniLDvy2MLwR8kopWeA=", - "dev": true - }, - "url-join": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz", - "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=", - "dev": true - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - } - } -} diff --git a/examples/transfer-files/public/js/app.js b/examples/transfer-files/public/js/app.js index 89954fd6b1..b664849af4 100644 --- a/examples/transfer-files/public/js/app.js +++ b/examples/transfer-files/public/js/app.js @@ -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) => { diff --git a/package.json b/package.json index 4e0a878294..0722f826ec 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/core/runtime/libp2p-browser.js b/src/core/runtime/libp2p-browser.js index 1db93dea73..8968fc8b62 100644 --- a/src/core/runtime/libp2p-browser.js +++ b/src/core/runtime/libp2p-browser.js @@ -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) { diff --git a/src/core/runtime/libp2p-nodejs.js b/src/core/runtime/libp2p-nodejs.js index 08e6e077e1..5533a96399 100644 --- a/src/core/runtime/libp2p-nodejs.js +++ b/src/core/runtime/libp2p-nodejs.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: [] }