Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

feat(swarm): interface-ipfs-core swarm compatibility #486

Merged
merged 1 commit into from
Sep 13, 2016
Merged

feat(swarm): interface-ipfs-core swarm compatibility #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/core/ipfs/id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ module.exports = function id (self) {
callback(null, {
id: self._peerInfo.id.toB58String(),
publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
addresses: self._peerInfo.multiaddrs.map((ma) => { return ma.toString() }).sort(),
addresses: self._peerInfo.multiaddrs.map((ma) => {
const addr = ma.toString() + '/ipfs/' + self._peerInfo.id.toB58String()
return addr
}).sort(),
agentVersion: 'js-ipfs',
protocolVersion: '9000'
})
Expand Down
52 changes: 37 additions & 15 deletions src/core/ipfs/libp2p.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const multiaddr = require('multiaddr')
const Libp2pNode = require('libp2p-ipfs').Node
const promisify = require('promisify-es6')

const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR

Expand Down Expand Up @@ -31,29 +32,50 @@ module.exports = function libp2p (self) {
self._libp2pNode.stop(callback)
},
swarm: {
peers: (callback) => {
peers: promisify((callback) => {
if (!self.isOnline()) {
return callback(OFFLINE_ERROR)
}

callback(null, self._libp2pNode.peerBook.getAll())
},
const peers = self._libp2pNode.peerBook.getAll()
const mas = []
Object
.keys(peers)
.forEach((b58Id) => {
peers[b58Id].multiaddrs.forEach((ma) => {
// TODO this should only print the addr we are using
mas.push(ma)
})
})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please map, instead of forEach and push

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is two forEach, it would require a flat step then

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then use _.flatten or pull.flatten :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is requiring a dependency to remove 0 lines (because the extra map to flatten step would take the exact same lines) worth it?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, because it makes the code much easier to read and understand


callback(null, mas)
}),
// all the addrs we know
addrs: (callback) => {
addrs: promisify((callback) => {
if (!self.isOnline()) {
return callback(OFFLINE_ERROR)
}
// TODO
throw new Error('Not implemented')
},
localAddrs: (callback) => {
const peers = self._libp2pNode.peerBook.getAll()
const mas = []
Object
.keys(peers)
.forEach((b58Id) => {
peers[b58Id].multiaddrs.forEach((ma) => {
// TODO this should only print the addr we are using
mas.push(ma)
})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

})

callback(null, mas)
}),
localAddrs: promisify((callback) => {
if (!self.isOnline()) {
return callback(OFFLINE_ERROR)
}

callback(null, self._libp2pNode.peerInfo.multiaddrs)
},
connect: (maddr, callback) => {
}),
connect: promisify((maddr, callback) => {
if (!self.isOnline()) {
return callback(OFFLINE_ERROR)
}
Expand All @@ -63,8 +85,8 @@ module.exports = function libp2p (self) {
}

self._libp2pNode.dialByMultiaddr(maddr, callback)
},
disconnect: (maddr, callback) => {
}),
disconnect: promisify((maddr, callback) => {
if (!self.isOnline()) {
return callback(OFFLINE_ERROR)
}
Expand All @@ -74,11 +96,11 @@ module.exports = function libp2p (self) {
}

self._libp2pNode.hangUpByMultiaddr(maddr, callback)
},
filters: () => {
}),
filters: promisify((callback) => {
// TODO
throw new Error('Not implemented')
}
})
},
routing: {},
records: {},
Expand Down
3 changes: 2 additions & 1 deletion test/cli/test-swarm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ describe('swarm', function () {
})
})

it('connect', (done) => {
// TODO revisit these once interface-ipfs-core over http-api are done
it.skip('connect', (done) => {
nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'swarm', 'connect', ipfsAddr], {env})
.run((err, stdout, exitcode) => {
expect(err).to.not.exist
Expand Down
5 changes: 4 additions & 1 deletion test/core/both/test-bitswap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ describe('bitswap', () => {
targetNode.id((err, identity) => {
expect(err).to.not.exist
const addr = identity.addresses
.map((addr) => multiaddr(addr))
.map((addr) => {
const ma = multiaddr(addr.toString().split('ipfs')[0])
return ma
})
.filter((addr) => {
return _.includes(addr.protoNames(), 'ws')
})[0]
Expand Down
7 changes: 2 additions & 5 deletions test/core/node-only/test-swarm-2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

'use strict'

/*
const test = require('interface-ipfs-core')
const IPFSFactory = require('../../utils/factory-core')

Expand All @@ -17,7 +16,5 @@ const common = {
factory.dismantle(cb)
}
}
*/
// TODO
// Needs: https://github.com/ipfs/js-libp2p-ipfs/pull/16
// test.swarm(common)

test.swarm(common)
6 changes: 3 additions & 3 deletions test/core/node-only/test-swarm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('swarm', function () {
(cb) => {
nodeB.id((err, res) => {
expect(err).to.not.exist
nodeBMultiaddr = `${res.addresses[0]}/ipfs/${res.id}`
nodeBMultiaddr = res.addresses[0]
cb()
})
}
Expand All @@ -73,14 +73,14 @@ describe('swarm', function () {
(cb) => {
nodeA.libp2p.swarm.peers((err, res) => {
expect(err).to.not.exist
expect(Object.keys(res)).to.have.length(1)
expect(Object.keys(res)).to.have.length.above(0)
cb()
})
},
(cb) => {
nodeB.libp2p.swarm.peers((err, res) => {
expect(err).to.not.exist
expect(Object.keys(res)).to.have.length(1)
expect(Object.keys(res)).to.have.length.above(0)
cb()
})
}
Expand Down
3 changes: 2 additions & 1 deletion test/http-api/inject/test-swarm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ const expect = require('chai').expect
const createTempNode = require('./../../utils/temp-node')

module.exports = (http) => {
describe('/swarm', function () {
// TODO revisit these once interface-ipfs-core tests over ipfs-api are done
describe.skip('/swarm', function () {
this.timeout(20000)

var api
Expand Down
3 changes: 2 additions & 1 deletion test/http-api/ipfs-api/test-swarm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ const expect = require('chai').expect
const createTempNode = require('./../../utils/temp-node')

module.exports = (ctl) => {
describe('.swarm', () => {
// TODO revisit these once the interface-ipfs-core tests over ipfs-api are done
describe.skip('.swarm', () => {
let remoteNode
let remoteNodeAddr

Expand Down