Merge pull request #11 from libp2p/pull

migrate to pull-streams

Author: daviddias

README.md

@@ -10,7 +10,6 @@ libp2p-ping JavaScript Implementation
 
 ## Usage
 
-
 ```javascript
 var Ping = require('libp2p-ping')
 

package.json

@@ -34,16 +34,17 @@
     "chai": "^3.5.0",
     "debug": "^2.2.0",
     "gulp": "^3.9.1",
-    "libp2p-swarm": "^0.22.2",
-    "libp2p-tcp": "^0.7.4",
+    "libp2p-swarm": "^0.23.0",
+    "libp2p-tcp": "^0.8.1",
     "multiaddr": "^2.0.2",
     "peer-id": "^0.7.0",
     "peer-info": "^0.7.0",
     "pre-commit": "^1.1.2",
     "run-parallel": "^1.1.6"
   },
   "dependencies": {
-    "async-buffered-reader": "^1.2.1"
+    "pull-reader": "^1.2.8",
+    "pull-stream": "^3.4.5"
   },
   "contributors": [
     "David Dias <[email protected]>",

src/index.js

@@ -1,80 +1,102 @@
 'use strict'
 
 const EventEmitter = require('events').EventEmitter
-const util = require('util')
-const read = require('async-buffered-reader')
+const pull = require('pull-stream')
+const Reader = require('pull-reader')
 const debug = require('debug')
-const log = {}
+const log = debug('libp2p-ping')
 log.error = debug('libp2p-ping:error')
 
-exports = module.exports = Ping
-exports.attach = attach
-exports.detach = detach
-
 const PROTOCOL = '/ipfs/ping/1.0.0'
+const PING_LENGTH = 32
 
-util.inherits(Ping, EventEmitter)
+class Ping extends EventEmitter {
+  constructor (swarm, peer) {
+    super()
+    this.cont = true
 
-function Ping (swarm, peer) {
-  this.cont = true
+    log('dialing %s to %s', PROTOCOL, peer.id.toB58String())
+    swarm.dial(peer, PROTOCOL, (err, conn) => {
+      if (err === true) {
+        return
+      }
 
-  swarm.dial(peer, PROTOCOL, (err, conn) => {
-    if (err) {
-      return this.emit('error', err)
-    }
+      if (err) {
+        log.error(err)
+        this.emit('error', err)
+        return
+      }
+
+      let start = new Date()
+      let buf = new Buffer(PING_LENGTH) // buffer creation doesn't memset the buffer to 0
+
+      const reader = Reader()
 
-    let start = new Date()
-    let buf = new Buffer(32) // buffer creation doesn't memset the buffer to 0
+      pull(pull.values([buf]), conn, reader)
 
-    conn.write(buf)
+      const gotBack = (err, bufBack) => {
+        let end = new Date()
 
-    const gotBack = (bufBack) => {
-      let end = new Date()
+        if (err || !buf.equals(bufBack)) {
+          pull(pull.empty(), conn)
+          this.emit('error', err || new Error('Received wrong ping ack'))
+          return
+        }
 
-      if (buf.equals(bufBack)) {
         this.emit('ping', end - start)
-      } else {
-        conn.end()
-        return this.emit('error', new Error('Received wrong ping ack'))
-      }
 
-      if (!this.cont) {
-        return conn.end()
-      }
+        if (!this.cont) {
+          pull(pull.empty(), conn)
+        }
 
-      start = new Date()
-      buf = new Buffer(32)
-      conn.write(buf)
-      read(conn, 32, gotBack)
-    }
+        start = new Date()
+        buf = new Buffer(PING_LENGTH)
 
-    read(conn, 32, gotBack)
-  })
+        pull(
+          pull.values([buf]),
+          reader,
+          conn
+        )
+
+        reader.read(PING_LENGTH, gotBack)
+      }
 
-  this.stop = () => {
+      reader.read(PING_LENGTH, gotBack)
+    })
+  }
+
+  stop () {
     this.cont = false
   }
 }
 
 function attach (swarm) {
   swarm.handle(PROTOCOL, (conn) => {
-    read(conn, 32, echo)
+    const reader = Reader()
+    pull(conn, reader)
 
-    function echo (buf) {
-      conn.write(buf)
-      read(conn, 32, echo)
-    }
+    reader.read(PING_LENGTH, echo)
 
-    conn.on('error', (err) => {
-      log.error(err)
-    })
+    function echo (err, buf) {
+      if (err === true) {
+        return
+      }
 
-    conn.on('end', () => {
-      conn.end()
-    })
+      if (err) {
+        log.error(err)
+      }
+
+      pull(pull.values([buf]), conn)
+      reader.read(PING_LENGTH, echo)
+    }
   })
 }
 
 function detach (swarm) {
   swarm.unhandle(PROTOCOL)
 }
+
+Ping.attach = attach
+Ping.detach = detach
+
+module.exports = Ping

test/ping.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const expect = require('chai').expect
 const Peer = require('peer-info')
 const Swarm = require('libp2p-swarm')
 const TCP = require('libp2p-tcp')
@@ -42,7 +43,12 @@ describe('ping', () => {
 
     var p = new Ping(swarmA, peerB)
 
+    p.on('error', (err) => {
+      throw err
+    })
+
     p.on('ping', (time) => {
+      expect(time).to.be.a('Number')
       p.stop()
       Ping.detach(swarmB)
       done()