chore: release version v0.28.2

chore: update contributors
revert: "fix: throw if no conn encryption module provided (#665 )"
2025-07-24 04:51:56 +00:00 · 2020-06-15 12:48:25 +02:00 · 2020-06-15 12:48:25 +02:00 · 2020-06-15 12:45:49 +02:00 · 2020-06-12 16:48:30 +02:00 · 2020-06-12 16:48:29 +02:00
7 changed files with 99 additions and 13 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+<a name="0.28.2"></a>
+## [0.28.2](https://github.com/libp2p/js-libp2p/compare/v0.28.1...v0.28.2) (2020-06-15)
+
+
+### Reverts
+
+* "fix: throw if no conn encryption module provided ([#665](https://github.com/libp2p/js-libp2p/issues/665))" ([b621fbd](https://github.com/libp2p/js-libp2p/commit/b621fbd))
+
+
+
+<a name="0.28.1"></a>
+## [0.28.1](https://github.com/libp2p/js-libp2p/compare/v0.28.0...v0.28.1) (2020-06-12)
+
+
+### Bug Fixes
+
+* throw if no conn encryption module provided ([#665](https://github.com/libp2p/js-libp2p/issues/665)) ([c038550](https://github.com/libp2p/js-libp2p/commit/c038550))
+
+
+### Features
+
+* add ConnectionManager#getAll ([8f680e2](https://github.com/libp2p/js-libp2p/commit/8f680e2))
+
+
+
 <a name="0.28.0"></a>
 # [0.28.0](https://github.com/libp2p/js-libp2p/compare/v0.28.0-rc.0...v0.28.0) (2020-06-05)

--- a/README.md
+++ b/README.md
@@ -155,7 +155,7 @@ List of packages currently in existence for libp2p
 | [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-kad-dht/master)](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
 | [`libp2p-mdns`](//github.com/libp2p/js-libp2p-mdns) | [![npm](https://img.shields.io/npm/v/libp2p-mdns.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-mdns/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-mdns.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-mdns) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-mdns/master)](https://travis-ci.com/libp2p/js-libp2p-mdns) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-mdns/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-mdns) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | [`libp2p-webrtc-star`](//github.com/libp2p/js-libp2p-webrtc-star) | [![npm](https://img.shields.io/npm/v/libp2p-webrtc-star.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-webrtc-star/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-webrtc-star.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-webrtc-star) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-webrtc-star/master)](https://travis-ci.com/libp2p/js-libp2p-webrtc-star) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-webrtc-star) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
-| [`discv5`](//github.com/ChainSafe/discv5) | [![npm](https://img.shields.io/npm/v/discv5.svg?maxAge=86400&style=flat-square)](//github.com/ChainSafe/discv5/releases) | [![Deps](https://david-dm.org/ChainSafe/discv5.svg?style=flat-square)](https://david-dm.org/ChainSafe/discv5) | [![Travis CI](https://flat.badgen.net/travis/ChainSafe/discv5/master)](https://travis-ci.com/ChainSafe/discv5) | [![codecov](https://codecov.io/gh/ChainSafe/discv5/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/ChainSafe/discv5) | [Cayman Nava](mailto:caymannava@gmail.com) |
+| [`@chainsafe/discv5`](//github.com/ChainSafe/discv5) | [![npm](https://img.shields.io/npm/v/@chainsafe/discv5.svg?maxAge=86400&style=flat-square)](//github.com/ChainSafe/discv5/releases) | [![Deps](https://david-dm.org/ChainSafe/discv5.svg?style=flat-square)](https://david-dm.org/ChainSafe/discv5) | [![Travis CI](https://flat.badgen.net/travis/ChainSafe/discv5/master)](https://travis-ci.com/ChainSafe/discv5) | [![codecov](https://codecov.io/gh/ChainSafe/discv5/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/ChainSafe/discv5) | [Cayman Nava](mailto:caymannava@gmail.com) |
 | **content routing** |
 | [`libp2p-delegated-content-routing`](//github.com/libp2p/js-libp2p-delegated-content-routing) | [![npm](https://img.shields.io/npm/v/libp2p-delegated-content-routing.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-delegated-content-routing/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-delegated-content-routing.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-delegated-content-routing) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-delegated-content-routing/master)](https://travis-ci.com/libp2p/js-libp2p-delegated-content-routing) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-delegated-content-routing/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-delegated-content-routing) | [Jacob Heun](mailto:jacobheun@gmail.com) |
 | [`libp2p-kad-dht`](//github.com/libp2p/js-libp2p-kad-dht) | [![npm](https://img.shields.io/npm/v/libp2p-kad-dht.svg?maxAge=86400&style=flat-square)](//github.com/libp2p/js-libp2p-kad-dht/releases) | [![Deps](https://david-dm.org/libp2p/js-libp2p-kad-dht.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-kad-dht) | [![Travis CI](https://flat.badgen.net/travis/libp2p/js-libp2p-kad-dht/master)](https://travis-ci.com/libp2p/js-libp2p-kad-dht) | [![codecov](https://codecov.io/gh/libp2p/js-libp2p-kad-dht/branch/master/graph/badge.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-kad-dht) | [Vasco Santos](mailto:vasco.santos@moxy.studio) |
--- a/package-list.json
+++ b/package-list.json
@@ -33,7 +33,7 @@
    ["libp2p/js-libp2p-kad-dht", "libp2p-kad-dht"],
    ["libp2p/js-libp2p-mdns", "libp2p-mdns"],
    ["libp2p/js-libp2p-webrtc-star", "libp2p-webrtc-star"],
-    ["ChainSafe/discv5", "discv5"],
+    ["ChainSafe/discv5", "@chainsafe/discv5"],

    "content routing",
    ["libp2p/js-libp2p-delegated-content-routing", "libp2p-delegated-content-routing"],
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "libp2p",
-  "version": "0.28.0",
+  "version": "0.28.2",
  "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
  "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
  "main": "src/index.js",
@@ -50,7 +50,7 @@
    "err-code": "^2.0.0",
    "events": "^3.1.0",
    "hashlru": "^2.3.0",
-    "interface-datastore": "^0.8.3",
+    "interface-datastore": "^1.0.4",
    "ipfs-utils": "^2.2.0",
    "it-all": "^1.0.1",
    "it-buffer": "^0.1.2",
@@ -92,7 +92,7 @@
    "datastore-level": "^1.1.0",
    "delay": "^4.3.0",
    "dirty-chai": "^2.0.1",
-    "interop-libp2p": "libp2p/interop#chore/update-libp2p-daemon-with-peerstore",
+    "interop-libp2p": "^0.1.0",
    "ipfs-http-client": "^44.0.0",
    "it-concat": "^1.0.0",
    "it-pair": "^1.0.0",
@@ -125,14 +125,14 @@
    "Jacob Heun <jacobheun@gmail.com>",
    "Vasco Santos <vasco.santos@moxy.studio>",
    "Alan Shaw <alan@tableflip.io>",
+    "Cayman <caymannava@gmail.com>",
    "Pedro Teixeira <i@pgte.me>",
    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
    "Alex Potsides <alex@achingbrain.net>",
    "Maciej Krüger <mkg20001@gmail.com>",
    "Hugo Dias <mail@hugodias.me>",
-    "Cayman <caymannava@gmail.com>",
-    "dirkmc <dirkmdev@gmail.com>",
    "Volker Mische <volker.mische@gmail.com>",
+    "dirkmc <dirkmdev@gmail.com>",
    "Richard Littauer <richard.littauer@gmail.com>",
    "Elven <mon.samuel@qq.com>",
    "Andrew Nesbitt <andrewnez@gmail.com>",
--- a/src/connection-manager/index.js
+++ b/src/connection-manager/index.js
@@ -215,6 +215,19 @@ class ConnectionManager extends EventEmitter {
   * @returns {Connection}
   */
  get (peerId) {
+    const connections = this.getAll(peerId)
+    if (connections.length) {
+      return connections[0]
+    }
+    return null
+  }
+
+  /**
+   * Get all open connections with a peer.
+   * @param {PeerId} peerId
+   * @returns {Array<Connection>}
+   */
+  getAll (peerId) {
    if (!PeerId.isPeerId(peerId)) {
      throw errcode(new Error('peerId must be an instance of peer-id'), ERR_INVALID_PARAMETERS)
    }
@@ -222,11 +235,11 @@ class ConnectionManager extends EventEmitter {
    const id = peerId.toB58String()
    const connections = this.connections.get(id)

-    // Return the first, open connection
+    // Return all open connections
    if (connections) {
-      return connections.find(connection => connection.stat.status === 'open')
+      return connections.filter(connection => connection.stat.status === 'open')
    }
-    return null
+    return []
  }

  /**
--- a/src/peer-store/persistent/index.js
+++ b/src/peer-store/persistent/index.js
@@ -96,7 +96,9 @@ class PersistentPeerStore extends PeerStore {

    if (this._dirtyPeers.size >= this.threshold) {
      // Commit current data
-      this._commitData()
+      this._commitData().catch(err => {
+        log.error('error committing data', err)
+      })
    }
  }

@@ -120,7 +122,9 @@ class PersistentPeerStore extends PeerStore {

    if (this._dirtyPeers.size >= this.threshold) {
      // Commit current data
-      this._commitData()
+      this._commitData().catch(err => {
+        log.error('error committing data', err)
+      })
    }
  }

--- a/test/peer-store/persisted-peer-store.spec.js
+++ b/test/peer-store/persisted-peer-store.spec.js
@@ -5,7 +5,6 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const { expect } = chai
 const sinon = require('sinon')
-
 const PeerStore = require('../../src/peer-store/persistent')
 const multiaddr = require('multiaddr')
 const { MemoryDatastore } = require('interface-datastore')
@@ -62,6 +61,7 @@ describe('Persisted PeerStore', () => {
      const protocols = ['/ping/1.0.0']
      const spyDirty = sinon.spy(peerStore, '_addDirtyPeer')
      const spyDs = sinon.spy(datastore, 'batch')
+      const commitSpy = sinon.spy(peerStore, '_commitData')

      await peerStore.start()

@@ -71,12 +71,18 @@ describe('Persisted PeerStore', () => {
      expect(spyDirty).to.have.property('callCount', 1) // Address
      expect(spyDs).to.have.property('callCount', 1)

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      // ProtoBook
      peerStore.protoBook.set(peer, protocols)

      expect(spyDirty).to.have.property('callCount', 2) // Protocol
      expect(spyDs).to.have.property('callCount', 2)

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      // Should have three peer records stored in the datastore
      const queryParams = {
        prefix: '/peers/'
@@ -98,6 +104,7 @@ describe('Persisted PeerStore', () => {
    it('should load content to the peerStore when restart but not put in datastore again', async () => {
      const spyDs = sinon.spy(datastore, 'batch')
      const peers = await peerUtils.createPeerId({ number: 2 })
+      const commitSpy = sinon.spy(peerStore, '_commitData')
      const multiaddrs = [
        multiaddr('/ip4/156.10.1.22/tcp/1000'),
        multiaddr('/ip4/156.10.1.23/tcp/1000')
@@ -110,17 +117,29 @@ describe('Persisted PeerStore', () => {
      peerStore.addressBook.set(peers[0], [multiaddrs[0]])
      peerStore.addressBook.set(peers[1], [multiaddrs[1]])

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      // KeyBook
      peerStore.keyBook.set(peers[0], peers[0].pubKey)
      peerStore.keyBook.set(peers[1], peers[1].pubKey)

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      // ProtoBook
      peerStore.protoBook.set(peers[0], protocols)
      peerStore.protoBook.set(peers[1], protocols)

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      // MetadataBook
      peerStore.metadataBook.set(peers[0], 'location', Buffer.from('earth'))

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      expect(spyDs).to.have.property('callCount', 7) // 2 Address + 2 Key + 2 Proto + 1 Metadata
      expect(peerStore.peers.size).to.equal(2)

@@ -148,6 +167,7 @@ describe('Persisted PeerStore', () => {
      const [peer] = await peerUtils.createPeerId()
      const multiaddrs = [multiaddr('/ip4/156.10.1.22/tcp/1000')]
      const protocols = ['/ping/1.0.0']
+      const commitSpy = sinon.spy(peerStore, '_commitData')

      await peerStore.start()

@@ -158,6 +178,9 @@ describe('Persisted PeerStore', () => {
      // MetadataBook
      peerStore.metadataBook.set(peer, 'location', Buffer.from('earth'))

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      const spyDs = sinon.spy(datastore, 'batch')
      const spyAddressBook = sinon.spy(peerStore.addressBook, 'delete')
      const spyKeyBook = sinon.spy(peerStore.keyBook, 'delete')
@@ -166,6 +189,10 @@ describe('Persisted PeerStore', () => {

      // Delete from PeerStore
      peerStore.delete(peer)
+
+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      await peerStore.stop()

      expect(spyAddressBook).to.have.property('callCount', 1)
@@ -197,6 +224,7 @@ describe('Persisted PeerStore', () => {
      const spyDirty = sinon.spy(peerStore, '_addDirtyPeer')
      const spyDirtyMetadata = sinon.spy(peerStore, '_addDirtyPeerMetadata')
      const spyDs = sinon.spy(datastore, 'batch')
+      const commitSpy = sinon.spy(peerStore, '_commitData')

      const peers = await peerUtils.createPeerId({ number: 2 })

@@ -213,9 +241,15 @@ describe('Persisted PeerStore', () => {
      peerStore.protoBook.set(peers[0], protocols)
      peerStore.metadataBook.set(peers[0], 'location', Buffer.from('earth'))

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      // Remove data from the same Peer
      peerStore.addressBook.delete(peers[0])

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      expect(spyDirty).to.have.property('callCount', 3) // 2 AddrBook ops, 1 ProtoBook op
      expect(spyDirtyMetadata).to.have.property('callCount', 1) // 1 MetadataBook op
      expect(peerStore._dirtyPeers.size).to.equal(1)
@@ -231,6 +265,9 @@ describe('Persisted PeerStore', () => {
      // Add data for second book
      peerStore.addressBook.set(peers[1], multiaddrs)

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      expect(spyDirty).to.have.property('callCount', 4)
      expect(spyDirtyMetadata).to.have.property('callCount', 1)
      expect(spyDs).to.have.property('callCount', 1)
@@ -333,6 +370,7 @@ describe('libp2p.peerStore (Persisted)', () => {
    })

    it('should load content to the peerStore when a new node is started with the same datastore', async () => {
+      const commitSpy = sinon.spy(libp2p.peerStore, '_commitData')
      const peers = await peerUtils.createPeerId({ number: 2 })
      const multiaddrs = [
        multiaddr('/ip4/156.10.1.22/tcp/1000'),
@@ -346,10 +384,16 @@ describe('libp2p.peerStore (Persisted)', () => {
      libp2p.peerStore.addressBook.set(peers[0], [multiaddrs[0]])
      libp2p.peerStore.addressBook.set(peers[1], [multiaddrs[1]])

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      // ProtoBook
      libp2p.peerStore.protoBook.set(peers[0], protocols)
      libp2p.peerStore.protoBook.set(peers[1], protocols)

+      // let batch commit complete
+      await Promise.all(commitSpy.returnValues)
+
      expect(libp2p.peerStore.peers.size).to.equal(2)

      await libp2p.stop()
Author	SHA1	Message	Date
Jacob Heun	a0cf83c640	chore: release version v0.28.2	2020-06-15 12:48:25 +02:00
Jacob Heun	b56cdda0ef	chore: update contributors	2020-06-15 12:48:25 +02:00
Jacob Heun	b621fbdfdc	revert: "fix: throw if no conn encryption module provided (#665 )" This reverts commit `c038550fad`.	2020-06-15 12:45:49 +02:00
Jacob Heun	24dd1d22c5	chore: release version v0.28.1	2020-06-12 16:48:30 +02:00
Jacob Heun	a1a1213bdc	chore: update contributors	2020-06-12 16:48:29 +02:00
Cayman	90a9d93968	chore: refactor ConnectionManager#get	2020-06-11 16:21:51 +02:00
Cayman	8f680e20e9	feat: add ConnectionManager#getAll	2020-06-11 16:21:51 +02:00
Cayman	afafd08943	chore: fix discv5 npm link chore: update package name for discv5	2020-06-11 13:03:31 +02:00
Vasco Santos	c038550fad	fix: throw if no conn encryption module provided (#665 ) * fix: throw if no conn encryption module provided * chore: address review * chore: apply suggestions from code review Co-authored-by: Jacob Heun <jacobheun@gmail.com> Co-authored-by: Jacob Heun <jacobheun@gmail.com>	2020-06-11 12:49:32 +02:00
Alex Potsides	d60a3215d0	chore: update interface datastore (#663 ) * chore: update interface datastore Updates to v1.x.x to not have multiple versions of this module in the ipfs browser bundle. * fix: let batch commits complete before continuing tests Batch commits are async but the tests weren't waiting for them to complete, mainly because they are triggered by events. There's no way that I can see of waiting for the batch commit to finish so I've added delays to the tests. Not great but a start. * chore: use error log * test: wait for commit spies to complete * chore: bump interface-datastore Co-authored-by: Jacob Heun <jacobheun@gmail.com>	2020-06-10 23:39:40 +02:00
Vasco Santos	1e51295150	chore: use interop release	2020-06-08 12:20:48 +02:00