libp2p 0.37.3 → 0.38.0-57ef754

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p",
-  "version": "0.37.3",
+  "version": "0.38.0-57ef754",
   "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,15 +49,19 @@
   ],
   "exports": {
     ".": {
+      "types": "./src/index.d.ts",
       "import": "./dist/src/index.js"
     },
     "./insecure": {
+      "types": "./dist/src/insecure/index.d.ts",
       "import": "./dist/src/insecure/index.js"
     },
     "./pnet": {
+      "types": "./dist/src/pnet/index.d.ts",
       "import": "./dist/src/pnet/index.js"
     },
     "./transport-manager": {
+      "types": "./dist/src/transport-manager.d.ts",
       "import": "./dist/src/transport-manager.js"
     }
   },
@@ -76,6 +80,7 @@
     "clean": "aegir clean",
     "lint": "aegir lint",
     "dep-check": "aegir dep-check",
+    "prepublishOnly": "node scripts/update-version.js",
     "build": "aegir build",
     "generate": "run-s generate:proto:*",
     "generate:proto:circuit": "protons ./src/circuit/pb/index.proto",
@@ -93,34 +98,50 @@
   },
   "dependencies": {
     "@achingbrain/nat-port-mapper": "^1.0.3",
-    "@libp2p/connection": "^2.0.2",
-    "@libp2p/crypto": "^0.22.11",
-    "@libp2p/interfaces": "^2.0.2",
-    "@libp2p/logger": "^1.1.4",
-    "@libp2p/multistream-select": "^1.0.4",
-    "@libp2p/peer-collections": "^1.0.2",
-    "@libp2p/peer-id": "^1.1.10",
-    "@libp2p/peer-id-factory": "^1.0.9",
-    "@libp2p/peer-record": "^1.0.8",
-    "@libp2p/peer-store": "^1.0.10",
-    "@libp2p/tracked-map": "^1.0.5",
-    "@libp2p/utils": "^1.0.10",
+    "@libp2p/components": "^2.0.3",
+    "@libp2p/connection": "^4.0.1",
+    "@libp2p/crypto": "^1.0.3",
+    "@libp2p/interface-address-manager": "^1.0.2",
+    "@libp2p/interface-connection": "^3.0.1",
+    "@libp2p/interface-connection-encrypter": "^2.0.1",
+    "@libp2p/interface-content-routing": "^1.0.2",
+    "@libp2p/interface-dht": "^1.0.1",
+    "@libp2p/interface-metrics": "^3.0.0",
+    "@libp2p/interface-peer-discovery": "^1.0.1",
+    "@libp2p/interface-peer-id": "^1.0.4",
+    "@libp2p/interface-peer-info": "^1.0.2",
+    "@libp2p/interface-peer-routing": "^1.0.1",
+    "@libp2p/interface-peer-store": "^1.2.1",
+    "@libp2p/interface-pubsub": "^2.0.1",
+    "@libp2p/interface-registrar": "^2.0.3",
+    "@libp2p/interface-stream-muxer": "^2.0.2",
+    "@libp2p/interface-transport": "^1.0.3",
+    "@libp2p/interfaces": "^3.0.3",
+    "@libp2p/logger": "^2.0.1",
+    "@libp2p/multistream-select": "^3.0.0",
+    "@libp2p/peer-collections": "^2.0.0",
+    "@libp2p/peer-id": "^1.1.15",
+    "@libp2p/peer-id-factory": "^1.0.18",
+    "@libp2p/peer-record": "^4.0.2",
+    "@libp2p/peer-store": "^3.1.3",
+    "@libp2p/tracked-map": "^2.0.1",
+    "@libp2p/utils": "^3.0.1",
     "@multiformats/mafmt": "^11.0.2",
-    "@multiformats/multiaddr": "^10.1.8",
+    "@multiformats/multiaddr": "^10.3.3",
     "abortable-iterator": "^4.0.2",
     "any-signal": "^3.0.0",
-    "datastore-core": "^7.0.0",
+    "datastore-core": "^8.0.1",
     "err-code": "^3.0.1",
     "events": "^3.3.0",
     "hashlru": "^2.3.0",
-    "interface-datastore": "^6.1.0",
+    "interface-datastore": "^7.0.0",
     "it-all": "^1.0.6",
     "it-drain": "^1.0.5",
     "it-filter": "^1.0.3",
     "it-first": "^1.0.6",
     "it-foreach": "^0.1.1",
-    "it-handshake": "^3.0.1",
-    "it-length-prefixed": "^7.0.1",
+    "it-handshake": "^4.1.2",
+    "it-length-prefixed": "^8.0.2",
     "it-map": "^1.0.6",
     "it-merge": "^1.0.3",
     "it-pair": "^2.0.2",
@@ -130,58 +151,61 @@
     "merge-options": "^3.0.4",
     "multiformats": "^9.6.3",
     "mutable-proxy": "^1.0.0",
-    "node-forge": "^1.2.1",
+    "node-forge": "^1.3.1",
     "p-fifo": "^1.0.0",
     "p-retry": "^5.0.0",
     "p-settle": "^5.0.0",
     "private-ip": "^2.3.3",
-    "protons-runtime": "^1.0.4",
+    "protons-runtime": "^3.0.1",
     "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",
     "uint8arrays": "^3.0.0",
-    "wherearewe": "^1.0.0",
+    "wherearewe": "^2.0.0",
     "xsalsa20": "^1.1.0"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-noise": "^6.2.0",
-    "@libp2p/bootstrap": "^1.0.4",
-    "@libp2p/daemon-client": "^1.0.2",
-    "@libp2p/daemon-server": "^1.0.2",
-    "@libp2p/delegated-content-routing": "^1.0.5",
-    "@libp2p/delegated-peer-routing": "^1.0.5",
-    "@libp2p/floodsub": "^1.0.6",
-    "@libp2p/interface-compliance-tests": "^2.0.3",
-    "@libp2p/interop": "^1.0.3",
-    "@libp2p/kad-dht": "^1.0.9",
-    "@libp2p/mdns": "^1.0.5",
-    "@libp2p/mplex": "^1.1.0",
-    "@libp2p/pubsub": "^1.2.18",
-    "@libp2p/tcp": "^1.0.9",
-    "@libp2p/topology": "^1.1.7",
-    "@libp2p/webrtc-star": "^1.0.8",
-    "@libp2p/websockets": "^1.0.7",
+    "@chainsafe/libp2p-noise": "^8.0.0",
+    "@libp2p/bootstrap": "^2.0.0",
+    "@libp2p/daemon-client": "^2.0.4",
+    "@libp2p/daemon-server": "^2.0.4",
+    "@libp2p/delegated-content-routing": "^2.0.1",
+    "@libp2p/delegated-peer-routing": "^2.0.1",
+    "@libp2p/floodsub": "^3.0.0",
+    "@libp2p/interface-compliance-tests": "^3.0.1",
+    "@libp2p/interface-connection-encrypter-compliance-tests": "^2.0.1",
+    "@libp2p/interface-mocks": "^4.0.1",
+    "@libp2p/interop": "^2.0.0",
+    "@libp2p/kad-dht": "^3.0.4",
+    "@libp2p/mdns": "^3.0.0",
+    "@libp2p/mplex": "^5.0.0",
+    "@libp2p/pubsub": "^3.0.1",
+    "@libp2p/tcp": "^3.0.5",
+    "@libp2p/topology": "^3.0.0",
+    "@libp2p/webrtc-star": "^3.0.0",
+    "@libp2p/websockets": "^3.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.0.9",
+    "aegir": "^37.3.0",
     "cborg": "^1.8.1",
     "delay": "^5.0.0",
     "execa": "^6.1.0",
     "go-libp2p": "^0.0.6",
     "into-stream": "^7.0.0",
     "ipfs-http-client": "^57.0.1",
-    "it-pushable": "^2.0.1",
+    "it-pushable": "^3.0.0",
     "it-to-buffer": "^2.0.2",
     "nock": "^13.0.3",
     "npm-run-all": "^4.1.5",
     "p-defer": "^4.0.0",
     "p-event": "^5.0.1",
     "p-times": "^4.0.0",
-    "p-wait-for": "^4.1.0",
-    "protons": "^3.0.4",
+    "p-wait-for": "^5.0.0",
+    "protons": "^5.0.0",
     "rimraf": "^3.0.2",
     "sinon": "^14.0.0",
     "ts-sinon": "^2.0.2"

package/src/address-manager/index.ts

@@ -1,8 +1,8 @@
-import type { AddressManagerEvents } from '@libp2p/interfaces/address-manager'
+import type { AddressManagerEvents } from '@libp2p/interface-address-manager'
 import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { peerIdFromString } from '@libp2p/peer-id'
-import type { Components } from '@libp2p/interfaces/components'
+import type { Components } from '@libp2p/components'
 
 export interface AddressManagerInit {
   announceFilter?: AddressFilter

package/src/circuit/README.md

@@ -41,7 +41,7 @@ import { Multiaddr } from '@multiformats/multiaddr'
 import Libp2p from 'libp2p'
 import { TCP } from '@libp2p/tcp'
 import { Mplex } from '@libp2p/mplex'
-import { NOISE } from '@chainsafe/libp2p-noise'
+import { Noise } from '@chainsafe/libp2p-noise'
 
 const relayAddr = ...
 
@@ -56,7 +56,7 @@ const node = await createLibp2p({
     new Mplex()
     ],
   connectionEncryption: [
-    NOISE
+    new Noise()
   ]
   },
   config: {

package/src/circuit/auto-relay.ts

@@ -10,10 +10,10 @@ import {
   HOP_METADATA_VALUE,
   RELAY_RENDEZVOUS_NS
 } from './constants.js'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { AddressSorter, PeerProtocolsChangeData } from '@libp2p/interfaces/peer-store'
-import type { Connection } from '@libp2p/interfaces/connection'
-import type { Components } from '@libp2p/interfaces/components'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { AddressSorter, PeerProtocolsChangeData } from '@libp2p/interface-peer-store'
+import type { Connection } from '@libp2p/interface-connection'
+import type { Components } from '@libp2p/components'
 import sort from 'it-sort'
 import all from 'it-all'
 import { pipe } from 'it-pipe'
@@ -260,6 +260,12 @@ export class AutoRelay {
         }
 
         const peerId = provider.id
+
+        if (peerId.equals(this.components.getPeerId())) {
+          // Skip the provider if it's us as dialing will fail
+          continue
+        }
+
         await this.components.getPeerStore().addressBook.add(peerId, provider.multiaddrs)
 
         await this._tryToListenOnRelay(peerId)

package/src/circuit/circuit/hop.ts

@@ -7,11 +7,13 @@ import { pipe } from 'it-pipe'
 import { codes as Errors } from '../../errors.js'
 import { stop } from './stop.js'
 import { RELAY_CODEC } from '../multicodec.js'
-import type { Connection } from '@libp2p/interfaces/connection'
+import type { Connection } from '@libp2p/interface-connection'
 import { peerIdFromBytes } from '@libp2p/peer-id'
 import type { Duplex } from 'it-stream-types'
 import type { Circuit } from '../transport.js'
-import type { ConnectionManager } from '@libp2p/interfaces/connection-manager'
+import type { ConnectionManager } from '@libp2p/interface-connection-manager'
+import type { AbortOptions } from '@libp2p/interfaces'
+import type { Uint8ArrayList } from 'uint8arraylist'
 
 const log = logger('libp2p:circuit:hop')
 
@@ -23,7 +25,7 @@ export interface HopRequest {
   connectionManager: ConnectionManager
 }
 
-export async function handleHop (hopRequest: HopRequest) {
+export async function handleHop (hopRequest: HopRequest): Promise<void> {
   const {
     connection,
     request,
@@ -83,7 +85,7 @@ export async function handleHop (hopRequest: HopRequest) {
     srcPeer: request.srcPeer
   }
 
-  let destinationStream: Duplex<Uint8Array>
+  let destinationStream: Duplex<Uint8ArrayList>
   try {
     log('performing STOP request')
     const result = await stop({
@@ -118,7 +120,7 @@ export async function handleHop (hopRequest: HopRequest) {
   )
 }
 
-export interface HopConfig {
+export interface HopConfig extends AbortOptions {
   connection: Connection
   request: CircuitPB
 }
@@ -127,14 +129,17 @@ export interface HopConfig {
  * Performs a HOP request to a relay peer, to request a connection to another
  * peer. A new, virtual, connection will be created between the two via the relay.
  */
-export async function hop (options: HopConfig): Promise<Duplex<Uint8Array>> {
+export async function hop (options: HopConfig): Promise<Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>> {
   const {
     connection,
-    request
+    request,
+    signal
   } = options
 
   // Create a new stream to the relay
-  const { stream } = await connection.newStream(RELAY_CODEC)
+  const stream = await connection.newStream(RELAY_CODEC, {
+    signal
+  })
   // Send the HOP request
   const streamHandler = new StreamHandler({ stream })
   streamHandler.write(request)
@@ -147,6 +152,7 @@ export async function hop (options: HopConfig): Promise<Duplex<Uint8Array>> {
 
   if (response.code === CircuitPB.Status.SUCCESS) {
     log('hop request was successful')
+
     return streamHandler.rest()
   }
 
@@ -156,7 +162,7 @@ export async function hop (options: HopConfig): Promise<Duplex<Uint8Array>> {
   throw errCode(new Error(`HOP request failed with code "${response.code ?? 'unknown'}"`), Errors.ERR_HOP_REQUEST_FAILED)
 }
 
-export interface CanHopOptions {
+export interface CanHopOptions extends AbortOptions {
   connection: Connection
 }
 
@@ -165,11 +171,14 @@ export interface CanHopOptions {
  */
 export async function canHop (options: CanHopOptions) {
   const {
-    connection
+    connection,
+    signal
   } = options
 
   // Create a new stream to the relay
-  const { stream } = await connection.newStream(RELAY_CODEC)
+  const stream = await connection.newStream(RELAY_CODEC, {
+    signal
+  })
 
   // Send the HOP request
   const streamHandler = new StreamHandler({ stream })

package/src/circuit/circuit/stop.ts

@@ -3,8 +3,10 @@ import { CircuitRelay as CircuitPB } from '../pb/index.js'
 import { RELAY_CODEC } from '../multicodec.js'
 import { StreamHandler } from './stream-handler.js'
 import { validateAddrs } from './utils.js'
-import type { Connection } from '@libp2p/interfaces/connection'
+import type { Connection } from '@libp2p/interface-connection'
 import type { Duplex } from 'it-stream-types'
+import type { AbortOptions } from '@libp2p/interfaces'
+import type { Uint8ArrayList } from 'uint8arraylist'
 
 const log = logger('libp2p:circuit:stop')
 
@@ -17,7 +19,7 @@ export interface HandleStopOptions {
 /**
  * Handles incoming STOP requests
  */
-export function handleStop (options: HandleStopOptions): Duplex<Uint8Array> | undefined {
+export function handleStop (options: HandleStopOptions): Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array> | undefined {
   const {
     connection,
     request,
@@ -42,7 +44,7 @@ export function handleStop (options: HandleStopOptions): Duplex<Uint8Array> | un
   return streamHandler.rest()
 }
 
-export interface StopOptions {
+export interface StopOptions extends AbortOptions {
   connection: Connection
   request: CircuitPB
 }
@@ -53,10 +55,13 @@ export interface StopOptions {
 export async function stop (options: StopOptions) {
   const {
     connection,
-    request
+    request,
+    signal
   } = options
 
-  const { stream } = await connection.newStream([RELAY_CODEC])
+  const stream = await connection.newStream(RELAY_CODEC, {
+    signal
+  })
   log('starting stop request to %p', connection.remotePeer)
   const streamHandler = new StreamHandler({ stream })
 

package/src/circuit/circuit/stream-handler.ts

@@ -2,8 +2,9 @@ import { logger } from '@libp2p/logger'
 import * as lp from 'it-length-prefixed'
 import { Handshake, handshake } from 'it-handshake'
 import { CircuitRelay } from '../pb/index.js'
-import type { Stream } from '@libp2p/interfaces/connection'
+import type { Stream } from '@libp2p/interface-connection'
 import type { Source } from 'it-stream-types'
+import type { Uint8ArrayList } from 'uint8arraylist'
 
 const log = logger('libp2p:circuit:stream-handler')
 
@@ -21,8 +22,8 @@ export interface StreamHandlerOptions {
 
 export class StreamHandler {
   private readonly stream: Stream
-  private readonly shake: Handshake
-  private readonly decoder: Source<Uint8Array>
+  private readonly shake: Handshake<Uint8ArrayList | Uint8Array>
+  private readonly decoder: Source<Uint8ArrayList>
 
   constructor (options: StreamHandlerOptions) {
     const { stream, maxLength = 4096 } = options
@@ -40,7 +41,7 @@ export class StreamHandler {
     const msg = await this.decoder.next()
 
     if (msg.value != null) {
-      const value = CircuitRelay.decode(msg.value.slice())
+      const value = CircuitRelay.decode(msg.value)
       log('read message type', value.type)
       return value
     }
@@ -55,7 +56,7 @@ export class StreamHandler {
    */
   write (msg: CircuitRelay) {
     log('write message type %s', msg.type)
-    this.shake.write(lp.encode.single(CircuitRelay.encode(msg)).slice())
+    this.shake.write(lp.encode.single(CircuitRelay.encode(msg)))
   }
 
   /**

package/src/circuit/index.ts

@@ -10,9 +10,10 @@ import { namespaceToCid } from './utils.js'
 import {
   RELAY_RENDEZVOUS_NS
 } from './constants.js'
-import type { AddressSorter } from '@libp2p/interfaces/peer-store'
+import type { AddressSorter } from '@libp2p/interface-peer-store'
 import type { Startable } from '@libp2p/interfaces/startable'
-import type { Components } from '@libp2p/interfaces/components'
+import type { Components } from '@libp2p/components'
+import type { RelayConfig } from '../index.js'
 
 const log = logger('libp2p:relay')
 
@@ -22,11 +23,6 @@ export interface RelayAdvertiseConfig {
   ttl?: number
 }
 
-export interface HopConfig {
-  enabled?: boolean
-  active?: boolean
-}
-
 export interface AutoRelayConfig {
   enabled?: boolean
 
@@ -36,13 +32,8 @@ export interface AutoRelayConfig {
   maxListeners: number
 }
 
-export interface RelayInit {
+export interface RelayInit extends RelayConfig {
   addressSorter?: AddressSorter
-  maxListeners?: number
-  onError?: (error: Error, msg?: string) => void
-  hop: HopConfig
-  advertise: RelayAdvertiseConfig
-  autoRelay: AutoRelayConfig
 }
 
 export class Relay implements Startable {

package/src/circuit/listener.ts

@@ -1,7 +1,7 @@
 import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
-import type { ConnectionManager } from '@libp2p/interfaces/connection-manager'
-import type { PeerStore } from '@libp2p/interfaces/peer-store'
-import type { Listener } from '@libp2p/interfaces/transport'
+import type { ConnectionManager } from '@libp2p/interface-connection-manager'
+import type { PeerStore } from '@libp2p/interface-peer-store'
+import type { Listener } from '@libp2p/interface-transport'
 import { peerIdFromString } from '@libp2p/peer-id'
 import { Multiaddr } from '@multiformats/multiaddr'