libp2p 0.42.2 → 0.43.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p",
-  "version": "0.42.2",
+  "version": "0.43.0",
   "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p#readme",
@@ -49,9 +49,13 @@
   ],
   "exports": {
     ".": {
-      "types": "./src/index.d.ts",
+      "types": "./dist/src/index.d.ts",
       "import": "./dist/src/index.js"
     },
+    "./circuit-relay": {
+      "types": "./dist/src/circuit/index.d.ts",
+      "import": "./dist/src/circuit/index.js"
+    },
     "./insecure": {
       "types": "./dist/src/insecure/index.d.ts",
       "import": "./dist/src/insecure/index.js"
@@ -75,11 +79,12 @@
   "scripts": {
     "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check",
+    "dep-check": "aegir dep-check -i protons",
     "prepublishOnly": "node scripts/update-version.js",
     "build": "aegir build",
     "docs": "aegir docs",
     "generate": "run-s generate:proto:*",
+    "generate:proto:autonat": "protons ./src/autonat/pb/index.proto",
     "generate:proto:circuit": "protons ./src/circuit/pb/index.proto",
     "generate:proto:fetch": "protons ./src/fetch/pb/proto.proto",
     "generate:proto:identify": "protons ./src/identify/pb/message.proto",
@@ -99,63 +104,64 @@
     "@libp2p/interface-address-manager": "^2.0.0",
     "@libp2p/interface-connection": "^3.0.2",
     "@libp2p/interface-connection-encrypter": "^3.0.1",
+    "@libp2p/interface-connection-gater": "^1.0.0",
     "@libp2p/interface-connection-manager": "^1.1.1",
     "@libp2p/interface-content-routing": "^2.0.0",
     "@libp2p/interface-dht": "^2.0.0",
+    "@libp2p/interface-keychain": "^2.0.4",
     "@libp2p/interface-libp2p": "^1.0.0",
     "@libp2p/interface-metrics": "^4.0.0",
     "@libp2p/interface-peer-discovery": "^1.0.1",
-    "@libp2p/interface-peer-id": "^2.0.0",
+    "@libp2p/interface-peer-id": "^2.0.1",
     "@libp2p/interface-peer-info": "^1.0.3",
     "@libp2p/interface-peer-routing": "^1.0.1",
     "@libp2p/interface-peer-store": "^1.2.2",
     "@libp2p/interface-pubsub": "^3.0.0",
+    "@libp2p/interface-record": "^2.0.6",
     "@libp2p/interface-registrar": "^2.0.3",
     "@libp2p/interface-stream-muxer": "^3.0.0",
     "@libp2p/interface-transport": "^2.1.0",
-    "@libp2p/interfaces": "^3.0.3",
+    "@libp2p/interfaces": "^3.2.0",
+    "@libp2p/keychain": "^2.0.0",
     "@libp2p/logger": "^2.0.1",
     "@libp2p/multistream-select": "^3.0.0",
     "@libp2p/peer-collections": "^3.0.0",
     "@libp2p/peer-id": "^2.0.0",
     "@libp2p/peer-id-factory": "^2.0.0",
     "@libp2p/peer-record": "^5.0.0",
-    "@libp2p/peer-store": "^6.0.0",
+    "@libp2p/peer-store": "^7.0.0",
+    "@libp2p/topology": "^4.0.1",
     "@libp2p/tracked-map": "^3.0.0",
     "@libp2p/utils": "^3.0.2",
-    "@multiformats/mafmt": "^11.0.2",
-    "@multiformats/multiaddr": "^11.0.0",
+    "@multiformats/mafmt": "^12.0.0",
+    "@multiformats/multiaddr": "^12.0.0",
     "abortable-iterator": "^4.0.2",
     "any-signal": "^3.0.0",
-    "datastore-core": "^8.0.1",
-    "err-code": "^3.0.1",
-    "events": "^3.3.0",
-    "hashlru": "^2.3.0",
-    "interface-datastore": "^7.0.0",
+    "datastore-core": "^9.0.0",
+    "interface-datastore": "^8.0.0",
     "it-all": "^2.0.0",
     "it-drain": "^2.0.0",
     "it-filter": "^2.0.0",
     "it-first": "^2.0.0",
-    "it-foreach": "^1.0.0",
+    "it-parallel": "^3.0.0",
     "it-handshake": "^4.1.2",
     "it-length-prefixed": "^8.0.2",
     "it-map": "^2.0.0",
     "it-merge": "^2.0.0",
     "it-pair": "^2.0.2",
+    "it-pb-stream": "^3.2.0",
     "it-pipe": "^2.0.3",
-    "it-sort": "^2.0.0",
     "it-stream-types": "^1.0.4",
     "merge-options": "^3.0.4",
     "multiformats": "^11.0.0",
-    "node-forge": "^1.3.1",
+    "p-defer": "^4.0.0",
     "p-fifo": "^1.0.0",
+    "p-queue": "^7.3.4",
     "p-retry": "^5.0.0",
-    "p-settle": "^5.0.0",
     "private-ip": "^3.0.0",
-    "protons-runtime": "^4.0.1",
+    "protons-runtime": "^5.0.0",
     "rate-limiter-flexible": "^2.3.11",
     "retimer": "^3.0.0",
-    "sanitize-filename": "^1.6.3",
     "set-delayed-interval": "^1.0.0",
     "timeout-abort-controller": "^3.0.0",
     "uint8arraylist": "^2.3.2",
@@ -164,42 +170,39 @@
     "xsalsa20": "^1.1.0"
   },
   "devDependencies": {
+    "@chainsafe/libp2p-gossipsub": "^6.2.0",
     "@chainsafe/libp2p-noise": "^11.0.0",
     "@chainsafe/libp2p-yamux": "^3.0.3",
     "@libp2p/bootstrap": "^6.0.0",
-    "@libp2p/daemon-client": "^4.0.1",
-    "@libp2p/daemon-server": "^4.0.1",
+    "@libp2p/daemon-client": "^5.0.0",
+    "@libp2p/daemon-server": "^4.1.0",
     "@libp2p/floodsub": "^6.0.0",
     "@libp2p/interface-compliance-tests": "^3.0.2",
     "@libp2p/interface-connection-compliance-tests": "^2.0.3",
     "@libp2p/interface-connection-encrypter-compliance-tests": "^4.0.0",
     "@libp2p/interface-mocks": "^9.0.0",
-    "@libp2p/interop": "^4.0.0",
-    "@libp2p/kad-dht": "^7.0.0",
-    "@libp2p/mdns": "^6.0.0",
+    "@libp2p/interop": "^7.0.0",
+    "@libp2p/kad-dht": "^8.0.0",
+    "@libp2p/mdns": "^7.0.0",
     "@libp2p/mplex": "^7.0.0",
     "@libp2p/pubsub": "^6.0.0",
     "@libp2p/tcp": "^6.0.0",
-    "@libp2p/topology": "^4.0.0",
-    "@libp2p/webrtc-star": "^6.0.0",
     "@libp2p/websockets": "^5.0.0",
-    "@types/node-forge": "^1.0.0",
     "@types/p-fifo": "^1.0.0",
     "@types/varint": "^6.0.0",
     "@types/xsalsa20": "^1.1.0",
-    "aegir": "^37.5.6",
+    "aegir": "^38.1.7",
     "cborg": "^1.8.1",
     "delay": "^5.0.0",
-    "execa": "^6.1.0",
-    "go-libp2p": "^0.0.6",
+    "execa": "^7.0.0",
+    "go-libp2p": "^1.0.1",
     "it-pushable": "^3.0.0",
-    "it-to-buffer": "^3.0.0",
+    "it-to-buffer": "^3.0.1",
     "npm-run-all": "^4.1.5",
-    "p-defer": "^4.0.0",
     "p-event": "^5.0.1",
     "p-times": "^4.0.0",
     "p-wait-for": "^5.0.0",
-    "protons": "^6.0.0",
+    "protons": "^7.0.2",
     "sinon": "^15.0.1",
     "sinon-ts": "^1.0.0"
   },

package/src/address-manager/index.ts

@@ -44,12 +44,35 @@ export interface AddressFilter {
 
 const defaultAddressFilter = (addrs: Multiaddr[]): Multiaddr[] => addrs
 
+interface ObservedAddressMetadata {
+  confident: boolean
+}
+
+/**
+ * If the passed multiaddr contains the passed peer id, remove it
+ */
+function stripPeerId (ma: Multiaddr, peerId: PeerId): Multiaddr {
+  const observedPeerIdStr = ma.getPeerId()
+
+  // strip our peer id if it has been passed
+  if (observedPeerIdStr != null) {
+    const observedPeerId = peerIdFromString(observedPeerIdStr)
+
+    // use same encoding for comparison
+    if (observedPeerId.equals(peerId)) {
+      ma = ma.decapsulate(multiaddr(`/p2p/${peerId.toString()}`))
+    }
+  }
+
+  return ma
+}
+
 export class DefaultAddressManager extends EventEmitter<AddressManagerEvents> {
   private readonly components: DefaultAddressManagerComponents
   // this is an array to allow for duplicates, e.g. multiples of `/ip4/0.0.0.0/tcp/0`
   private readonly listen: string[]
   private readonly announce: Set<string>
-  private readonly observed: Set<string>
+  private readonly observed: Map<string, ObservedAddressMetadata>
   private readonly announceFilter: AddressFilter
 
   /**
@@ -66,7 +89,7 @@ export class DefaultAddressManager extends EventEmitter<AddressManagerEvents> {
     this.components = components
     this.listen = listen.map(ma => ma.toString())
     this.announce = new Set(announce.map(ma => ma.toString()))
-    this.observed = new Set()
+    this.observed = new Map()
     this.announceFilter = init.announceFilter ?? defaultAddressFilter
   }
 
@@ -88,52 +111,51 @@ export class DefaultAddressManager extends EventEmitter<AddressManagerEvents> {
    * Get observed multiaddrs
    */
   getObservedAddrs (): Multiaddr[] {
-    return Array.from(this.observed).map((a) => multiaddr(a))
+    return Array.from(this.observed).map(([a]) => multiaddr(a))
   }
 
   /**
    * Add peer observed addresses
-   * Signal that we have confidence an observed multiaddr is publicly dialable -
-   * this will make it appear in the output of getAddresses()
    */
-  confirmObservedAddr (addr: Multiaddr): void {
-
-  }
+  addObservedAddr (addr: Multiaddr): void {
+    addr = stripPeerId(addr, this.components.peerId)
+    const addrString = addr.toString()
 
-  /**
-   * Signal that we do not have confidence an observed multiaddr is publicly dialable -
-   * this will remove it from the output of getObservedAddrs()
-   */
-  removeObservedAddr (addr: Multiaddr): void {
+    // do not trigger the change:addresses event if we already know about this address
+    if (this.observed.has(addrString)) {
+      return
+    }
 
+    this.observed.set(addrString, {
+      confident: false
+    })
   }
 
-  /**
-   * Add peer observed addresses
-   */
-  addObservedAddr (addr: string | Multiaddr): void {
-    let ma = multiaddr(addr)
-    const remotePeer = ma.getPeerId()
-
-    // strip our peer id if it has been passed
-    if (remotePeer != null) {
-      const remotePeerId = peerIdFromString(remotePeer)
-
-      // use same encoding for comparison
-      if (remotePeerId.equals(this.components.peerId)) {
-        ma = ma.decapsulate(multiaddr(`/p2p/${this.components.peerId.toString()}`))
-      }
+  confirmObservedAddr (addr: Multiaddr): void {
+    addr = stripPeerId(addr, this.components.peerId)
+    const addrString = addr.toString()
+
+    const metadata = this.observed.get(addrString) ?? {
+      confident: false
     }
 
-    const addrString = ma.toString()
+    const startingConfidence = metadata.confident
 
-    // do not trigger the change:addresses event if we already know about this address
-    if (this.observed.has(addrString)) {
-      return
+    this.observed.set(addrString, {
+      confident: true
+    })
+
+    // only trigger the change:addresses event if our confidence in an address has changed
+    if (!startingConfidence) {
+      this.dispatchEvent(new CustomEvent('change:addresses'))
     }
+  }
+
+  removeObservedAddr (addr: Multiaddr): void {
+    addr = stripPeerId(addr, this.components.peerId)
+    const addrString = addr.toString()
 
-    this.observed.add(addrString)
-    this.dispatchEvent(new CustomEvent('change:addresses'))
+    this.observed.delete(addrString)
   }
 
   getAddresses (): Multiaddr[] {
@@ -144,7 +166,12 @@ export class DefaultAddressManager extends EventEmitter<AddressManagerEvents> {
       addrs = this.components.transportManager.getAddrs().map(ma => ma.toString())
     }
 
-    addrs = addrs.concat(this.getObservedAddrs().map(ma => ma.toString()))
+    // add observed addresses we are confident in
+    addrs = addrs.concat(
+      Array.from(this.observed)
+        .filter(([ma, metadata]) => metadata.confident)
+        .map(([ma]) => ma)
+    )
 
     // dedupe multiaddrs
     const addrSet = new Set(addrs)

package/src/autonat/constants.ts

@@ -0,0 +1,4 @@
+
+export const PROTOCOL = '/libp2p/autonat/1.0.0'
+export const PROTOCOL_VERSION = '1.0.0'
+export const PROTOCOL_NAME = 'autonat'