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

Commit

Permalink
fix: ipfs.id does not double append ipfs/<id> anymore (#732)
Browse files Browse the repository at this point in the history
  • Loading branch information
daviddias authored Jan 28, 2017
1 parent 89367a5 commit 718394a
Showing 1 changed file with 14 additions and 17 deletions.
31 changes: 14 additions & 17 deletions src/core/components/id.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
'use strict'

const promisify = require('promisify-es6')
const mafmt = require('mafmt')

module.exports = function id (self) {
return promisify((opts, callback) => {
if (typeof opts === 'function') {
callback = opts
opts = {}
}
if (!self._peerInfo) { // because of split second warmup
setTimeout(ready, 100)
} else {
ready()
}

function ready () {
callback(null, {
id: self._peerInfo.id.toB58String(),
publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
addresses: self._peerInfo.multiaddrs.map((ma) => {
const addr = ma.toString() + '/ipfs/' + self._peerInfo.id.toB58String()
return addr
}).sort(),
agentVersion: 'js-ipfs',
protocolVersion: '9000'
})
}
setImmediate(() => callback(null, {
id: self._peerInfo.id.toB58String(),
publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
addresses: self._peerInfo.multiaddrs.map((ma) => {
if (mafmt.IPFS.matches(ma)) {
return ma.toString()
} else {
return ma.toString() + '/ipfs/' + self._peerInfo.id.toB58String()
}
}).sort(),
agentVersion: 'js-ipfs',
protocolVersion: '9000'
}))
})
}

0 comments on commit 718394a

Please sign in to comment.