diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a59ad3..a348b67a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,3 @@ - -## [0.15.2](https://github.com/libp2p/js-libp2p-webrtc-star/compare/v0.15.0...v0.15.2) (2018-06-01) - - -### Bug Fixes - -* race condition using pump ([2e430c1](https://github.com/libp2p/js-libp2p-webrtc-star/commit/2e430c1)) - - -### Features - -* using block-stream to control webRTC transport ([8d76dd0](https://github.com/libp2p/js-libp2p-webrtc-star/commit/8d76dd0)) - - - ## [0.15.1](https://github.com/libp2p/js-libp2p-webrtc-star/compare/v0.15.0...v0.15.1) (2018-06-01) diff --git a/README.md b/README.md index a273fd37..6599cd2c 100644 --- a/README.md +++ b/README.md @@ -54,11 +54,6 @@ const ws2 = new WStar({ wrtc: electronWebRTC() }) const WStar = require('libp2p-webrtc-star') const ws = new WStar() - -// defining maximum allowed buffer (defaults to 16kb) -const ws3 = new Wstar({ - blockStreamSize: 64 * 1024 // 64kb -}) ``` ## API @@ -99,7 +94,7 @@ Defaults: ## Hosted Rendezvous Server We host a signalling server at `star-signal.cloud.ipfs.team` that can be used for practical demos and experimentation, it **should not be used for apps in production**. -A libp2p-webrtc-star address, using the signalling server we provide, looks like: +A libp2p-webrtc-star address, using the signalling server we provide, looks like: `/dns4/star-signal.cloud.ipfs.team/wss/p2p-webrtc-star/ipfs/` diff --git a/package.json b/package.json index d57b77f6..9548be07 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libp2p-webrtc-star", - "version": "0.15.2", + "version": "0.15.1", "description": "libp2p WebRTC transport that includes a discovery mechanism provided by the signalling-star", "main": "src/index.js", "bin": { @@ -58,7 +58,6 @@ }, "dependencies": { "async": "^2.6.0", - "block-stream": "0.0.9", "class-is": "^1.1.0", "debug": "^3.1.0", "detect-node": "^2.0.3", @@ -73,7 +72,6 @@ "peer-id": "~0.10.7", "peer-info": "~0.14.1", "pull-stream": "^3.6.8", - "pump": "^3.0.0", "simple-peer": "^9.1.1", "socket.io": "^2.1.0", "socket.io-client": "^2.1.0", @@ -92,7 +90,6 @@ "Pedro Teixeira ", "Richard Littauer ", "Steverman ", - "Yahya ", "dmitriy ryajov ", "greenkeeper[bot] ", "greenkeeperio-bot ", diff --git a/src/index.js b/src/index.js index 940f6490..cb488242 100644 --- a/src/index.js +++ b/src/index.js @@ -12,8 +12,6 @@ const PeerId = require('peer-id') const PeerInfo = require('peer-info') const Connection = require('interface-connection').Connection const toPull = require('stream-to-pull-stream') -const BlockStream = require('block-stream') -const pump = require('pump') const once = require('once') const setImmediate = require('async/setImmediate') const webrtcSupport = require('webrtcsupport') @@ -43,8 +41,6 @@ class WebRTCStar { this.wrtc = options.wrtc } - this.blockStreamSize = options.blockStreamSize || 16 * 1024 - this.discovery = new EE() this.discovery.start = (callback) => { setImmediate(callback) } this.discovery.stop = (callback) => { setImmediate(callback) } @@ -73,14 +69,7 @@ class WebRTCStar { const channel = new SimplePeer(spOptions) - const block = new BlockStream(this.blockStreamSize, {nopad: true}) - - pump(channel, block, channel, (err) => { - if (err) return callback(err) - }) - - const conn = new Connection(toPull.duplex(block)) - + const conn = new Connection(toPull.duplex(channel)) let connected = false channel.on('signal', (signal) => { @@ -180,13 +169,7 @@ class WebRTCStar { const channel = new SimplePeer(spOptions) - const block = new BlockStream(this.blockStreamSize, {nopad: true}) - - pump(channel, block, channel, (err) => { - if (err) return callback(err) - }) - - const conn = new Connection(toPull.duplex(block)) + const conn = new Connection(toPull.duplex(channel)) channel.once('connect', () => { conn.getObservedAddrs = (callback) => {