start integrating libp2p into the mix, start the swarm listener on jsipfs daemon

Author: daviddias

package.json

@@ -74,9 +74,12 @@
     "ipfs-merkle-dag": "^0.2.1",
     "ipfs-repo": "^0.5.0",
     "joi": "^8.0.2",
+    "libp2p-ipfs": "^0.1.0",
     "lodash.get": "^4.0.0",
     "lodash.set": "^4.0.0",
+    "multiaddr": "^1.1.1",
     "peer-id": "^0.5.0",
+    "peer-info": "^0.4.0",
     "ronin": "^0.3.11"
   }
 }

src/http-api/index.js

@@ -48,6 +48,17 @@ exports.start = (callback) => {
     // load routes
     require('./routes')
 
+    // start libp2p
+    ipfs.libp2p.start({}, (err) => {
+      if (err) {
+        console.log(err)
+      }
+      ipfs.nodeInfo.multiaddrs.forEach((multiaddr) => {
+        console.log('Swarm listening on', multiaddr.toString())
+      })
+    })
+
+    // start http-api
     server.start((err) => {
       if (err) {
         return callback(err)

src/ipfs-core/index.js

@@ -1,14 +1,14 @@
-'use strict'
-
 const defaultRepo = require('./default-repo')
-// const bl = require('bl')
 const blocks = require('ipfs-blocks')
 const BlockService = blocks.BlockService
 const Block = blocks.Block
 const mDAG = require('ipfs-merkle-dag')
 const DAGNode = mDAG.DAGNode
 const DAGService = mDAG.DAGService
-const peerId = require('peer-id')
+const PeerId = require('peer-id')
+const PeerInfo = require('peer-info')
+const libp2p = require('libp2p-ipfs')
+const multiaddr = require('multiaddr')
 
 exports = module.exports = IPFS
 
@@ -24,6 +24,8 @@ function IPFS (repo) {
   const blockS = new BlockService(repo)
   const dagS = new DAGService(blockS)
 
+  var libp2pNode
+
   this.version = (opts, callback) => {
     if (typeof opts === 'function') {
       callback = opts
@@ -53,7 +55,7 @@ function IPFS (repo) {
         if (err) {
           return callback(err)
         }
-        var pid = peerId.createFromPrivKey(config.Identity.PrivKey)
+        var pid = PeerId.createFromPrivKey(config.Identity.PrivKey)
         callback(null, {
           ID: config.Identity.PeerID,
           PublicKey: pid.pubKey,
@@ -124,7 +126,7 @@ function IPFS (repo) {
     replace: (config, callback) => {
       repo.config.set(config, callback)
     },
-    show: callback => {
+    show: (callback) => {
       repo.config.get((err, config) => {
         if (err) { return callback(err) }
         callback(null, config)
@@ -281,4 +283,28 @@ function IPFS (repo) {
       })
     }
   }
+
+  this.libp2p = {
+    start: (options, callback) => {
+      // create libp2pNode and make it to listen
+      // patch this.libp2p with .routing .records and .swarm
+      this.config.show((err, config) => {
+        if (err) {
+          return callback(err)
+        }
+        options.multiaddrs = { tcp: multiaddr(config.Addresses.Swarm[0]) }
+        this.nodeId = PeerId.createFromPrivKey(config.Identity.PrivKey)
+
+        this.nodeInfo = new PeerInfo(this.nodeId, [])
+        options.peer = this.nodeInfo
+
+        libp2pNode = libp2p(options)
+        this.libp2p.swarm = libp2pNode.swarm
+        this.libp2p.routing = libp2pNode.routing
+        this.libp2p.records = libp2pNode.records
+        libp2pNode.listen(callback)
+      })
+    },
+    stop: (options, callback) => {}
+  }
 }