Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

attempt to handle changes to ipfs swarm peers api #427

Merged
merged 4 commits into from
Nov 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
"url": "https://github.com/ipfs/js-ipfs-api"
},
"devDependencies": {
"aegir": "^9.1.0",
"aegir": "^9.1.2",
"chai": "^3.5.0",
"gulp": "^3.9.1",
"hapi": "^15.2.0",
"interface-ipfs-core": "^0.18.3",
"interface-ipfs-core": "^0.20.0",
"ipfsd-ctl": "^0.17.0",
"pre-commit": "^1.1.3",
"socket.io": "^1.5.1",
Expand Down
46 changes: 43 additions & 3 deletions src/api/swarm.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,56 @@ module.exports = (send) => {
callback = opts
opts = {}
}

const verbose = opts.v || opts.verbose

send({
path: 'swarm/peers',
qs: opts
}, (err, result) => {
if (err) {
return callback(err)
}
callback(null, result.Strings.map((addr) => {
return multiaddr(addr)
}))

if (result.Strings) {
// go-ipfs <= 0.4.4
callback(null, result.Strings.map((p) => {
const res = {}

if (verbose) {
const parts = p.split(' ')
res.addr = multiaddr(parts[0])
res.latency = parts[1]
} else {
res.addr = multiaddr(p)
}

res.peer = PeerId.createFromB58String(
res.addr.decapsulate('ipfs')
)

return res
}))
} else if (result.Peers) {
// go-ipfs >= 0.4.5
callback(null, result.Peers.map((p) => {
const res = {
addr: multiaddr(p.Addr),
peer: PeerId.createFromB58String(p.Peer),
muxer: p.Muxer
}

if (p.Latency) {
res.latency = p.Latency
}

if (p.Streams) {
res.streams = p.Streams
}

return res
}))
}
})
}),
connect: promisify((args, opts, callback) => {
Expand Down