Merge branch 'master' into ci-buildkite

.aegir.js

@@ -1,7 +1,17 @@
 'use strict'
 
+const path = require('path')
+
 module.exports = {
   webpack: {
+    resolve: {
+      alias: {
+        'node-forge': path.resolve(
+          path.dirname(require.resolve('libp2p-crypto')),
+          '../vendor/forge.bundle.js'
+        )
+      }
+    },
     externals: {
       fs: '{}',
       mkdirp: '{}'

CHANGELOG.md

@@ -0,0 +1,15 @@
+<a name="9.0.0"></a>
+# [9.0.0](https://github.com/ipfs/js-ipfs-api/compare/v8.0.4...v9.0.0) (2016-09-15)
+
+
+### Bug Fixes
+
+* Return req from tail ([0273a3a](https://github.com/ipfs/js-ipfs-api/commit/0273a3a))
+
+
+### Features
+
+* **swarm:** make interface-ipfs-core compliant ([f245f27](https://github.com/ipfs/js-ipfs-api/commit/f245f27))
+
+
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs-api",
-  "version": "8.0.4",
+  "version": "9.0.0",
   "description": "A client library for the IPFS HTTP API. Follows interface-ipfs-core spec",
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",
@@ -31,11 +31,13 @@
     "multiaddr": "^2.0.2",
     "multipart-stream": "^2.0.1",
     "ndjson": "^1.4.3",
+    "peer-id": "^0.7.0",
+    "peer-info": "^0.7.1",
     "promisify-es6": "^1.0.1",
     "qs": "^6.2.1",
+    "streamifier": "^0.1.1",
     "tar-stream": "^1.5.2",
-    "wreck": "^10.0.0",
-    "streamifier": "^0.1.1"
+    "wreck": "^10.0.0"
   },
   "engines": {
     "node": ">=4.2.2"
@@ -49,7 +51,7 @@
     "chai": "^3.5.0",
     "gulp": "^3.9.1",
     "hapi": "^15.0.2",
-    "interface-ipfs-core": "^0.14.5",
+    "interface-ipfs-core": "^0.15.0",
     "ipfsd-ctl": "^0.14.0",
     "pre-commit": "^1.1.3",
     "socket.io": "^1.4.8",
@@ -87,6 +89,7 @@
     "Richard Littauer <richard.littauer@gmail.com>",
     "Stephen Whitmore <stephen.whitmore@gmail.com>",
     "Travis Person <travis.person@gmail.com>",
+    "Victor Bjelkholm <victorbjelkholm@gmail.com>",
     "Victor Bjelkholm <victor@typeform.com>",
     "ethers <ethereum@outlook.com>",
     "greenkeeperio-bot <support@greenkeeper.io>",

src/api/swarm.js

@@ -2,6 +2,8 @@
 
 const promisify = require('promisify-es6')
 const multiaddr = require('multiaddr')
+const PeerId = require('peer-id')
+const PeerInfo = require('peer-info')
 
 module.exports = (send) => {
   return {
@@ -56,11 +58,17 @@ module.exports = (send) => {
         if (err) {
           return callback(err)
         }
-        callback(null, Object.keys(result.Addrs).map((id) => {
-          return result.Addrs[id].map((maStr) => {
-            return multiaddr(maStr).encapsulate('/ipfs/' + id)
+
+        const peers = Object.keys(result.Addrs).map((id) => {
+          const info = new PeerInfo(PeerId.createFromB58String(id))
+          result.Addrs[id].forEach((addr) => {
+            info.multiaddr.add(multiaddr(addr))
           })
-        })[0])
+
+          return info
+        })
+
+        callback(null, peers)
       })
     }),
     localAddrs: promisify((opts, callback) => {