feat: pinpoint

Author: daviddias

package.json

@@ -150,6 +150,7 @@
     "progress": "^2.0.1",
     "promisify-es6": "^1.0.3",
     "pull-abortable": "^4.1.1",
+    "pull-catch": "^1.0.0",
     "pull-defer": "~0.2.3",
     "pull-file": "^1.1.0",
     "pull-ndjson": "~0.1.1",

src/core/components/ping-pull-stream.js

@@ -22,8 +22,7 @@ module.exports = function pingPullStream (self) {
     getPeer(self._libp2pNode, source, peerId, (err, peer) => {
       if (err) {
         log.error(err)
-        source.push(err)
-        source.end()
+        source.end(err)
         return
       }
 

src/http/api/resources/ping.js

@@ -2,6 +2,7 @@
 
 const Joi = require('joi')
 const pull = require('pull-stream')
+const pullatch = require('pull-catch')
 const toStream = require('pull-stream-to-stream')
 const ndjson = require('pull-ndjson')
 const PassThrough = require('readable-stream').PassThrough
@@ -23,9 +24,19 @@ exports.get = {
   handler: (request, reply) => {
     const ipfs = request.server.app.ipfs
     const peerId = request.query.arg
+
     // Default count to 10
     const count = request.query.n || request.query.count || 10
 
+    // Streams from pull-stream-to-stream don't seem to be compatible
+    // with the stream2 readable interface
+    // see: https://github.com/hapijs/hapi/blob/c23070a3de1b328876d5e64e679a147fafb04b38/lib/response.js#L533
+    // and: https://github.com/pull-stream/pull-stream-to-stream/blob/e436acee18b71af8e71d1b5d32eee642351517c7/index.js#L28
+
+    // TODO: here lies the issue
+    // The fact that ping can fail after it starts writting some success ndjson
+    // responses is not very friendly to how Hapi expects this stream to work
+    // This multiple stream transformation and stiching is a nightmare
     const source = pull(
       ipfs.pingPullStream(peerId, { count: count }),
       pull.map((chunk) => ({
@@ -36,10 +47,6 @@ exports.get = {
       ndjson.serialize()
     )
 
-    // Streams from pull-stream-to-stream don't seem to be compatible
-    // with the stream2 readable interface
-    // see: https://github.com/hapijs/hapi/blob/c23070a3de1b328876d5e64e679a147fafb04b38/lib/response.js#L533
-    // and: https://github.com/pull-stream/pull-stream-to-stream/blob/e436acee18b71af8e71d1b5d32eee642351517c7/index.js#L28
     const responseStream = toStream.source(source)
     const stream2 = new PassThrough()
     pump(responseStream, stream2)