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

Commit d939323

Browse files
victorbdaviddias
victorb
authored and
daviddias
committed
fix: only show connected addrs for peers in swarm.peers
1 parent 06ac6b8 commit d939323

File tree

6 files changed

+38
-52
lines changed

6 files changed

+38
-52
lines changed

‎package.json‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@
6363
"devDependencies": {
6464
"aegir": "^11.0.2",
6565
"buffer-loader": "0.0.1",
66-
"chai": "^4.1.1",
66+
"chai": "^4.1.2",
6767
"delay": "^2.0.0",
6868
"detect-node": "^2.0.3",
6969
"dir-compare": "^1.4.0",
7070
"dirty-chai": "^2.0.1",
71-
"eslint-plugin-react": "^7.2.1",
71+
"eslint-plugin-react": "^7.3.0",
7272
"execa": "^0.8.0",
7373
"expose-loader": "^0.7.3",
74-
"form-data": "^2.2.0",
74+
"form-data": "^2.3.1",
7575
"gulp": "^3.9.1",
76-
"interface-ipfs-core": "~0.30.1",
76+
"interface-ipfs-core": "~0.31.12",
7777
"ipfsd-ctl": "~0.21.0",
7878
"left-pad": "^1.1.3",
7979
"lodash": "^4.17.4",
@@ -92,8 +92,8 @@
9292
"async": "^2.5.0",
9393
"bl": "^1.2.1",
9494
"boom": "^5.2.0",
95-
"cids": "^0.5.1",
96-
"debug": "^3.0.0",
95+
"cids": "~0.5.1",
96+
"debug": "^3.0.1",
9797
"fsm-event": "^2.1.0",
9898
"glob": "^7.1.2",
9999
"hapi": "^16.5.2",
@@ -111,30 +111,29 @@
111111
"is-ipfs": "^0.3.0",
112112
"is-stream": "^1.1.0",
113113
"joi": "^10.6.0",
114-
"libp2p": "^0.11.0",
114+
"libp2p": "~0.11.0",
115115
"libp2p-floodsub": "~0.11.0",
116-
"libp2p-kad-dht": "^0.4.1",
117-
"libp2p-mdns": "^0.8.0",
118-
"libp2p-multiplex": "^0.4.4",
119-
"libp2p-railing": "^0.6.1",
120-
"libp2p-secio": "^0.7.1",
121-
"libp2p-swarm": "^0.31.0",
122-
"libp2p-tcp": "^0.10.2",
123-
"libp2p-webrtc-star": "^0.12.0",
124-
"libp2p-websockets": "^0.10.1",
116+
"libp2p-kad-dht": "~0.4.1",
117+
"libp2p-mdns": "~0.8.0",
118+
"libp2p-multiplex": "~0.4.4",
119+
"libp2p-railing": "~0.6.1",
120+
"libp2p-secio": "~0.7.1",
121+
"libp2p-tcp": "~0.10.2",
122+
"libp2p-webrtc-star": "~0.12.0",
123+
"libp2p-websockets": "~0.10.1",
125124
"lodash.flatmap": "^4.5.0",
126125
"lodash.get": "^4.4.2",
127126
"lodash.sortby": "^4.7.0",
128127
"lodash.values": "^4.3.0",
129128
"mafmt": "^2.1.8",
130-
"mkdirp": "^0.5.1",
129+
"mkdirp": "~0.5.1",
131130
"multiaddr": "^2.3.0",
132-
"multihashes": "~0.4.5",
131+
"multihashes": "~0.4.8",
133132
"once": "^1.4.0",
134133
"path-exists": "^3.0.0",
135-
"peer-book": "^0.5.0",
136-
"peer-id": "^0.9.0",
137-
"peer-info": "^0.10.0",
134+
"peer-book": "~0.5.0",
135+
"peer-id": "~0.9.0",
136+
"peer-info": "~0.10.0",
138137
"promisify-es6": "^1.0.3",
139138
"pull-file": "^1.0.0",
140139
"pull-paramap": "^1.2.2",
@@ -148,13 +147,13 @@
148147
"safe-buffer": "^5.1.1",
149148
"stream-to-pull-stream": "^1.7.2",
150149
"tar-stream": "^1.5.4",
151-
"temp": "^0.8.3",
150+
"temp": "~0.8.3",
152151
"through2": "^2.0.3",
153152
"update-notifier": "^2.2.0",
154153
"yargs": "8.0.2"
155154
},
156155
"optionalDependencies": {
157-
"prom-client": "^10.0.2",
156+
"prom-client": "^10.0.4",
158157
"prometheus-gc-stats": "^0.5.0"
159158
},
160159
"contributors": [

‎src/core/components/swarm.js‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
const multiaddr = require('multiaddr')
44
const promisify = require('promisify-es6')
5-
const flatMap = require('lodash.flatmap')
65
const values = require('lodash.values')
76

87
const OFFLINE_ERROR = require('../utils').OFFLINE_ERROR
@@ -24,24 +23,19 @@ module.exports = function swarm (self) {
2423
// we currently don't have this information
2524

2625
const peers = values(self._peerInfoBook.getAll())
27-
.filter((peer) => peer.isConnected())
28-
29-
const peerList = flatMap(peers, (peer) => {
30-
return peer.multiaddrs.toArray().map((addr) => {
26+
.map((peer) => {
27+
const connectedAddr = peer.isConnected()
3128
const res = {
32-
addr: addr,
29+
addr: connectedAddr,
3330
peer: peer
3431
}
35-
3632
if (verbose) {
3733
res.latency = 'unknown'
3834
}
39-
4035
return res
4136
})
42-
})
4337

44-
callback(null, peerList)
38+
callback(null, peers)
4539
}),
4640

4741
// all the addrs we know

‎test/cli/bootstrap.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,22 @@ describe('bootstrap', () => runOnAndOff((thing) => {
1414

1515
const defaultList = [
1616
'/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
17-
'/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
1817
'/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
1918
'/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
2019
'/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
2120
'/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
2221
'/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
23-
'/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
24-
'/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
22+
'/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3'
2523
]
2624

2725
const updatedList = [
2826
'/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
29-
'/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
3027
'/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
3128
'/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
3229
'/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
3330
'/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
3431
'/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
3532
'/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
36-
'/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx',
3733
'/ip4/111.111.111.111/tcp/1001/ipfs/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD'
3834
]
3935

‎test/core/bootstrap.spec.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,22 @@ describe('bootstrap', () => {
4545

4646
const defaultList = [
4747
'/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
48-
'/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
4948
'/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
5049
'/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
5150
'/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
5251
'/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
5352
'/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
54-
'/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
55-
'/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
53+
'/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3'
5654
]
5755

5856
const updatedList = [
5957
'/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
60-
'/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
6158
'/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
6259
'/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
6360
'/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
6461
'/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
6562
'/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
6663
'/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
67-
'/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx',
6864
'/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'
6965
]
7066

‎test/test-data/otherconfig‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@
4343
"RecordLifetime": "",
4444
"ResolveCacheSize": 128
4545
},
46-
"Bootstrap": ["/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ", "/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z", "/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM", "/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm", "/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu", "/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64", "/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd", "/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3", "/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx"],
46+
"Bootstrap": [
47+
"/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
48+
"/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z",
49+
"/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM", "/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm", "/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu", "/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64", "/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd", "/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3", "/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx"],
4750
"Tour": {
4851
"Last": ""
4952
},

‎test/utils/ipfs-factory-daemon/index.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ class Factory {
1515
}
1616

1717
/* yields a new started node */
18-
spawnNode (repoPath, config, callback) {
18+
spawnNode (repoPath, suppliedConfig, callback) {
1919
if (typeof repoPath === 'function') {
2020
callback = repoPath
2121
repoPath = undefined
2222
}
23-
if (typeof config === 'function') {
24-
callback = config
25-
config = undefined
23+
if (typeof suppliedConfig === 'function') {
24+
callback = suppliedConfig
25+
suppliedConfig = undefined
2626
}
2727

2828
repoPath = repoPath ||
@@ -32,15 +32,13 @@ class Factory {
3232

3333
let daemon
3434
let ctl
35+
let config
3536

3637
series([
3738
(cb) => {
3839
// prepare config for node
39-
if (config) {
40-
return cb()
41-
}
4240

43-
config = JSON.parse(JSON.stringify(defaultConfig))
41+
config = Object.assign({}, defaultConfig, config || {})
4442

4543
PeerId.create({ bits: 1024 }, (err, id) => {
4644
if (err) {

0 commit comments

Comments
 (0)