chore: release version v0.25.5

* fix: peer routing tests

* test: fix mock payload type

Provider results are type 4, not type 1: 6e566d10f4/routing/query.go (L15-L24)

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="0.25.5"></a>
+## [0.25.5](https://github.com/libp2p/js-libp2p/compare/v0.25.4...v0.25.5) (2019-07-12)
+
+
+### Bug Fixes
+
+* peer routing for delegate router ([#377](https://github.com/libp2p/js-libp2p/issues/377)) ([905c911](https://github.com/libp2p/js-libp2p/commit/905c911)), closes [/github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go#L15-L24](https://github.com//github.com/libp2p/go-libp2p-core/blob/6e566d10f4a5447317a66d64c7459954b969bdab/routing/query.go/issues/L15-L24)
+
+
+
 <a name="0.25.4"></a>
 ## [0.25.4](https://github.com/libp2p/js-libp2p/compare/v0.25.3...v0.25.4) (2019-06-07)
 

examples/delegated-routing/README.md

@@ -10,17 +10,18 @@ The starting [Libp2p Bundle](./src/libp2p-bundle.js) in this example starts by d
 Once you've completed the example, you should try enabled the DHT and see what kind of results you get! You can also enable the
 various Peer Discovery modules and see the impact it has on your Peer count.
 
+## Prerequisite
+**NOTE**: This example is currently dependent on a clone of the [delegated routing support branch of go-ipfs](https://github.com/ipfs/go-ipfs/pull/4595).
 
 ## Running this example
 
-1. Install go-ipfs locally if you dont already have it. [Install Guide](https://docs.ipfs.io/introduction/install/).
-1. Run the IPFS daemon: `ipfs daemon`.
-1. The daemon will output a line about its API address, like `API server listening on /ip4/127.0.0.1/tcp/8080`.
-1. In another window, while the daemon is running, Configure the IPFS Gateway to support delegate routing `ipfs config Gateway.APICommands --json '["dht/findprovs", "dht/findpeer", "refs", "swarm/connect"]'`.
-1. In the same window, output the addresses of the node: `ipfs id`. Make note of the websocket address, it will contain `/ws` in the address, like `/ip4/127.0.0.1/tcp/8081/ws`.
-1. In `./src/libp2p-bundle.js` check if the host and port of your node are correct, according to the previous step. If they are different, replace them.
-1. In `./src/App.js` replace `BootstrapNode` with your nodes Websocket address from step 3. **Also**, in `./src/App.js` set BootstrapNodeID to your nodes id, which is displayed when running `ipfs id` in the `ID` property.
-1. Start this example:
+1. Install IPFS locally if you dont already have it. [Install Guide](https://docs.ipfs.io/introduction/install/)
+2. Run the IPFS daemon: `ipfs daemon`
+3. The daemon will output a line about its API address, like `API server listening on /ip4/127.0.0.1/tcp/8080`
+4. In another window output the addresses of the node: `ipfs id`. Make note of the websocket address, it will contain `/ws/` in the address.
+5. In `./src/libp2p-bundle.js` check if the host and port of your node are correct, according to the previous step. If they are different, replace them.
+6. In `./src/App.js` replace `BootstrapNode` with your nodes Websocket address from step 4.
+7. Start this example:
 
 ```sh
 npm install
@@ -46,12 +47,3 @@ This will do a few things:
 2. Copy one of the CIDs from the list of peer addresses, this will be the last portion of the address and will look something like `QmdoG8DpzYUZMVP5dGmgmigZwR1RE8Cf6SxMPg1SBXJAQ8`.
 3. In your browser, paste the CID into the *Peer* field and hit `Find`.
 4. You should see information about the peer including its addresses.
-
-### Adding Content via the Delegate
-1. In one browser, such as Firefox, enter some text in the `Add Data` field and click `Add`.
-2. Once added, JSON will be printed in the browser. Copy the value of `"hash"`.
-3. Close your Firefox tab. Open a new browser window in a **different** browser, such as Chrome.
-4. In the new window, copy the hash from step 2 into the `Hash` field and click `Find`.
-5. The text you entered in step 1 should display.
-
-**Note**: By closing the first window before fetching the content, you are ensuring that data cannot be retrieved from it, and instead the delegate must be relied on.

examples/delegated-routing/package.json

@@ -3,16 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "ipfs": "~0.36.1",
+    "ipfs": "~0.34.4",
     "libp2p": "github:libp2p/js-libp2p#master",
     "libp2p-delegated-content-routing": "~0.2.2",
     "libp2p-delegated-peer-routing": "~0.2.2",
-    "libp2p-kad-dht": "~0.15.0",
+    "libp2p-kad-dht": "~0.14.12",
+    "libp2p-mplex": "~0.8.5",
     "libp2p-secio": "~0.11.1",
-    "libp2p-webrtc-star": "~0.16.1",
+    "libp2p-webrtc-star": "~0.15.8",
     "libp2p-websocket-star": "~0.10.2",
     "libp2p-websockets": "~0.12.2",
-    "pull-mplex": "~0.1.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
     "react-scripts": "2.1.8"

examples/delegated-routing/src/App.js

@@ -6,10 +6,7 @@ import Ipfs from 'ipfs'
 import libp2pBundle from './libp2p-bundle'
 const Component = React.Component
 
-/* TODO: Add your go IPFS nodes ID here by running `ipfs id` */
-const BootstrapNodeID = 'Qm...'
-/* TODO: Ensure the IP and port match your nodes Websocket address shown when running the daemon `ipfs daemon` */
-const BootstrapNode = `/ip4/127.0.0.1/tcp/8081/ws/p2p/${BootstrapNodeID}`
+const BootstrapNode = '/ip4/127.0.0.1/tcp/8081/ws/p2p/QmdoG8DpzYUZMVP5dGmgmigZwR1RE8Cf6SxMPg1SBXJAQ8'
 
 class App extends Component {
   constructor (props) {
@@ -20,7 +17,6 @@ class App extends Component {
       hash: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB',
       // This peer is one of the Bootstrap nodes for IPFS
       peer: 'QmV6kA2fB8kTr6jc3pL5zbNsjKbmPUHAPKKHRBYe1kDEyc',
-      data: '',
       isLoading: 0
     }
     this.peerInterval = null
@@ -29,8 +25,6 @@ class App extends Component {
     this.handleHashSubmit = this.handleHashSubmit.bind(this)
     this.handlePeerChange = this.handlePeerChange.bind(this)
     this.handlePeerSubmit = this.handlePeerSubmit.bind(this)
-    this.handleDataChange = this.handleDataChange.bind(this)
-    this.handleDataSubmit = this.handleDataSubmit.bind(this)
   }
 
   handleHashChange (event) {
@@ -43,11 +37,6 @@ class App extends Component {
       peer: event.target.value
     })
   }
-  handleDataChange (event) {
-    this.setState({
-      data: event.target.value
-    })
-  }
 
   handleHashSubmit (event) {
     event.preventDefault()
@@ -55,7 +44,7 @@ class App extends Component {
       isLoading: this.state.isLoading + 1
     })
 
-    this.ipfs.cat(this.state.hash, (err, data) => {
+    this.ipfs.files.cat(this.state.hash, (err, data) => {
       if (err) console.log('Error', err)
 
       this.setState({
@@ -70,22 +59,7 @@ class App extends Component {
       isLoading: this.state.isLoading + 1
     })
 
-    this.ipfs.dht.findPeer(this.state.peer, (err, results) => {
-      if (err) console.log('Error', err)
-
-      this.setState({
-        response: JSON.stringify(results, null, 2),
-        isLoading: this.state.isLoading - 1
-      })
-    })
-  }
-  handleDataSubmit (event) {
-    event.preventDefault()
-    this.setState({
-      isLoading: this.state.isLoading + 1
-    })
-
-    this.ipfs.add(Buffer.from(this.state.data), (err, results) => {
+    this.ipfs.dht.findpeer(this.state.peer, (err, results) => {
       if (err) console.log('Error', err)
 
       this.setState({
@@ -161,13 +135,6 @@ class App extends Component {
               <input type="submit" value="Find" />
             </label>
           </form>
-          <form onSubmit={this.handleDataSubmit}>
-            <label>
-              Add Data:
-              <input type="text" value={this.state.data} onChange={this.handleDataChange} />
-              <input type="submit" value="Add" />
-            </label>
-          </form>
         </section>
         <section className={[this.state.isLoading > 0 ? 'loading' : '', 'loader'].join(' ')}>
           <div className="lds-ripple"><div></div><div></div></div>

examples/delegated-routing/src/libp2p-bundle.js

@@ -5,7 +5,7 @@ const Libp2p = require('libp2p')
 const Websockets = require('libp2p-websockets')
 const WebSocketStar = require('libp2p-websocket-star')
 const WebRTCStar = require('libp2p-webrtc-star')
-const MPLEX = require('pull-mplex')
+const MPLEX = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const KadDHT = require('libp2p-kad-dht')
 const DelegatedPeerRouter = require('libp2p-delegated-peer-routing')
@@ -14,9 +14,8 @@ const DelegatedContentRouter = require('libp2p-delegated-content-routing')
 export default function Libp2pBundle ({peerInfo, peerBook}) {
   const wrtcstar = new WebRTCStar({id: peerInfo.id})
   const wsstar = new WebSocketStar({id: peerInfo.id})
-  /* TODO: Ensure the delegatedApiOptions match your IPFS nodes API server */
   const delegatedApiOptions = {
-    host: '127.0.0.1',
+    host: '0.0.0.0',
     protocol: 'http',
     port: '8080'
   }
@@ -26,8 +25,7 @@ export default function Libp2pBundle ({peerInfo, peerBook}) {
     peerBook,
     // Lets limit the connection managers peers and have it check peer health less frequently
     connectionManager: {
-      minPeers: 20,
-      maxPeers: 50,
+      maxPeers: 10,
       pollInterval: 5000
     },
     modules: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p",
-  "version": "0.25.4",
+  "version": "0.25.5",
   "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
   "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
   "main": "src/index.js",
@@ -129,8 +129,8 @@
     "Sönke Hahn <soenkehahn@gmail.com>",
     "Thomas Eizinger <thomas@eizinger.io>",
     "Tiago Alves <alvesjtiago@gmail.com>",
-    "Vasco Santos <vasco.santos@ua.pt>",
     "Vasco Santos <vasco.santos@moxy.studio>",
+    "Vasco Santos <vasco.santos@ua.pt>",
     "Volker Mische <volker.mische@gmail.com>",
     "Yusef Napora <yusef@napora.org>",
     "Zane Starr <zcstarr@gmail.com>",

src/peer-routing.js

@@ -47,7 +47,7 @@ module.exports = (node) => {
       })
 
       tryEach(tasks, (err, results) => {
-        if (err && err.code !== 'NOT_FOUND') {
+        if (err) {
           return callback(err)
         }
         results = results || []

test/content-routing.node.js

@@ -251,7 +251,7 @@ describe('.contentRouting', () => {
             timeout: '1000ms',
             'stream-channels': true
           })
-          .reply(200, `{"Extra":"","ID":"QmWKqWXCtRXEeCQTo3FoZ7g4AfnGiauYYiczvNxFCHicbB","Responses":[{"Addrs":["/ip4/0.0.0.0/tcp/0"],"ID":"${provider}"}],"Type":1}\n`, [
+          .reply(200, `{"Extra":"","ID":"QmWKqWXCtRXEeCQTo3FoZ7g4AfnGiauYYiczvNxFCHicbB","Responses":[{"Addrs":["/ip4/0.0.0.0/tcp/0"],"ID":"${provider}"}],"Type":4}\n`, [
             'Content-Type', 'application/json',
             'X-Chunked-Output', '1'
           ])