deps!: update to libp2p 0.46.x

achingbrain · achingbrain · commit f444d5a95977 · 2023-08-05T17:31:47.000+01:00
Updates all libp2p deps to 0.46.x to close streams gracefully.

BREAKING CHANGE: requires libp2p@0.46.x or later
diff --git a/.aegir.js b/.aegir.js
@@ -2,6 +2,6 @@
 /** @type {import('aegir').PartialOptions} */
 export default {
   build: {
-    bundlesizeMax: '32KB'
+    bundlesizeMax: '33KB'
   }
 }
diff --git a/package.json b/package.json
@@ -143,15 +143,8 @@
     "docs": "aegir docs"
   },
   "dependencies": {
-    "@libp2p/interface-connection": "^5.1.0",
-    "@libp2p/interface-libp2p": "^3.1.0",
-    "@libp2p/interface-peer-id": "^2.0.0",
-    "@libp2p/interface-peer-info": "^1.0.8",
-    "@libp2p/interface-registrar": "^2.0.8",
-    "@libp2p/interfaces": "^3.2.0",
-    "@libp2p/logger": "^2.0.5",
-    "@libp2p/topology": "^4.0.0",
-    "@libp2p/tracked-map": "^3.0.0",
+    "@libp2p/interface": "^0.1.1",
+    "@libp2p/logger": "^3.0.1",
     "@multiformats/multiaddr": "^12.1.0",
     "@vascosantos/moving-average": "^1.1.0",
     "abortable-iterator": "^5.0.1",
@@ -166,7 +159,7 @@
     "it-pipe": "^3.0.1",
     "it-take": "^3.0.1",
     "just-debounce-it": "^3.0.1",
-    "multiformats": "^11.0.0",
+    "multiformats": "^12.0.1",
     "progress-events": "^1.0.0",
     "protons-runtime": "^5.0.0",
     "timeout-abort-controller": "^3.0.0",
@@ -176,12 +169,12 @@
     "varint-decoder": "^1.0.0"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-noise": "^12.0.0",
-    "@libp2p/kad-dht": "^9.3.3",
-    "@libp2p/mplex": "^8.0.3",
-    "@libp2p/peer-id": "^2.0.0",
-    "@libp2p/peer-id-factory": "^2.0.0",
-    "@libp2p/tcp": "^7.0.1",
+    "@chainsafe/libp2p-noise": "^13.0.0",
+    "@libp2p/kad-dht": "^10.0.2",
+    "@libp2p/mplex": "^9.0.2",
+    "@libp2p/peer-id": "^3.0.1",
+    "@libp2p/peer-id-factory": "^3.0.2",
+    "@libp2p/tcp": "^8.0.2",
     "@nodeutils/defaults-deep": "^1.1.0",
     "@types/lodash.difference": "^4.5.7",
     "@types/lodash.flatten": "^4.4.7",
@@ -195,7 +188,7 @@
     "iso-random-stream": "^2.0.0",
     "it-all": "^3.0.1",
     "it-drain": "^3.0.1",
-    "libp2p": "^0.45.1",
+    "libp2p": "^0.46.3",
     "lodash.difference": "^4.5.0",
     "lodash.flatten": "^4.4.0",
     "lodash.range": "^3.2.0",
diff --git a/src/bitswap.ts b/src/bitswap.ts
@@ -9,8 +9,8 @@ import { logger } from './utils/index.js'
 import { WantManager } from './want-manager/index.js'
 import type { BitswapOptions, Bitswap, MultihashHasherLoader, WantListEntry, BitswapWantProgressEvents, BitswapNotifyProgressEvents } from './index.js'
 import type { BitswapMessage } from './message/index.js'
-import type { Libp2p } from '@libp2p/interface-libp2p'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Libp2p } from '@libp2p/interface'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { Logger } from '@libp2p/logger'
 import type { AbortOptions } from '@multiformats/multiaddr'
 import type { Blockstore, Pair } from 'interface-blockstore'
diff --git a/src/decision-engine/index.ts b/src/decision-engine/index.ts
@@ -1,4 +1,4 @@
-import { trackedMap } from '@libp2p/tracked-map'
+import { trackedMap } from '@libp2p/interface/metrics/tracked-map'
 import { base58btc } from 'multiformats/bases/base58'
 import { CID } from 'multiformats/cid'
 import { BitswapMessage as Message } from '../message/index.js'
@@ -12,8 +12,8 @@ import type { Message as PBMessage } from '../message/message.js'
 import type { Network } from '../network.js'
 import type { Stats } from '../stats/index.js'
 import type { WantListEntry } from '../wantlist/entry.js'
-import type { Libp2p } from '@libp2p/interface-libp2p'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Libp2p } from '@libp2p/interface'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { Logger } from '@libp2p/logger'
 import type { Blockstore } from 'interface-blockstore'
 
diff --git a/src/decision-engine/ledger.ts b/src/decision-engine/ledger.ts
@@ -1,7 +1,7 @@
 import { Wantlist } from '../wantlist/index.js'
 import type { Message } from '../message/message.js'
 import type { WantListEntry } from '../wantlist/entry.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { CID } from 'multiformats/cid'
 
 export class Ledger {
diff --git a/src/decision-engine/req-queue.ts b/src/decision-engine/req-queue.ts
@@ -1,6 +1,6 @@
 import { SortedMap } from '../utils/sorted-map.js'
 import type { Task, TaskMerger } from './index.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 
 export interface PopTaskResult {
   peerId?: PeerId
diff --git a/src/index.ts b/src/index.ts
@@ -1,10 +1,10 @@
 import { DefaultBitswap } from './bitswap.js'
 import type { Message } from './message/message'
 import type { BitswapNetworkNotifyProgressEvents, BitswapNetworkWantProgressEvents } from './network.js'
-import type { Libp2p } from '@libp2p/interface-libp2p'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Libp2p } from '@libp2p/interface'
+import type { PeerId } from '@libp2p/interface/peer-id'
+import type { Startable } from '@libp2p/interface/startable'
 import type { AbortOptions } from '@libp2p/interfaces'
-import type { Startable } from '@libp2p/interfaces/startable'
 import type { IMovingAverage } from '@vascosantos/moving-average'
 import type { Blockstore } from 'interface-blockstore'
 import type { CID } from 'multiformats/cid'
diff --git a/src/network.ts b/src/network.ts
@@ -1,5 +1,4 @@
-import { createTopology } from '@libp2p/topology'
-import { abortableSource } from 'abortable-iterator'
+import { CodeError } from '@libp2p/interface/errors'
 import drain from 'it-drain'
 import * as lp from 'it-length-prefixed'
 import map from 'it-map'
@@ -13,11 +12,12 @@ import { logger } from './utils/index.js'
 import type { DefaultBitswap } from './bitswap.js'
 import type { MultihashHasherLoader } from './index.js'
 import type { Stats } from './stats/index.js'
-import type { Connection } from '@libp2p/interface-connection'
-import type { Libp2p } from '@libp2p/interface-libp2p'
-import type { PeerId } from '@libp2p/interface-peer-id'
-import type { PeerInfo } from '@libp2p/interface-peer-info'
-import type { IncomingStreamData } from '@libp2p/interface-registrar'
+import type { Libp2p } from '@libp2p/interface'
+import type { Connection } from '@libp2p/interface/connection'
+import type { PeerId } from '@libp2p/interface/peer-id'
+import type { PeerInfo } from '@libp2p/interface/peer-info'
+import type { IncomingStreamData } from '@libp2p/interface/stream-handler'
+import type { Topology } from '@libp2p/interface/topology'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { Logger } from '@libp2p/logger'
 import type { Multiaddr } from '@multiformats/multiaddr'
@@ -107,10 +107,10 @@ export class Network {
     })
 
     // register protocol with topology
-    const topology = createTopology({
+    const topology: Topology = {
       onConnect: this._onPeerConnect,
       onDisconnect: this._onPeerDisconnect
-    })
+    }
 
     /** @type {string[]} */
     this._registrarIds = []
@@ -153,10 +153,16 @@ export class Network {
     const controller = new TimeoutController(this._incomingStreamTimeout)
 
     Promise.resolve().then(async () => {
-      this._log('incoming new bitswap %s connection from %p', stream.stat.protocol, connection.remotePeer)
+      this._log('incoming new bitswap %s connection from %p', stream.protocol, connection.remotePeer)
+      const abortListener = (): void => {
+        stream.abort(new CodeError('Incoming Bitswap stream timed out', 'ERR_TIMEOUT'))
+      }
+
+      let signal = AbortSignal.timeout(this._incomingStreamTimeout)
+      signal.addEventListener('abort', abortListener)
 
       await pipe(
-        abortableSource(stream.source, controller.signal),
+        stream,
         (source) => lp.decode(source),
         async (source) => {
           for await (const data of source) {
@@ -169,18 +175,23 @@ export class Network {
             }
 
             // we have received some data so reset the timeout controller
-            controller.reset()
+            signal.removeEventListener('abort', abortListener)
+            signal = AbortSignal.timeout(this._incomingStreamTimeout)
+            signal.addEventListener('abort', abortListener)
           }
         }
       )
+
+      await stream.close({
+        signal
+      })
     })
       .catch(err => {
         this._log(err)
         stream.abort(err)
       })
       .finally(() => {
         controller.clear()
-        stream.close()
       })
   }
 
@@ -273,7 +284,7 @@ export class Network {
     try {
       /** @type {Uint8Array} */
       let serialized
-      switch (stream.stat.protocol) {
+      switch (stream.protocol) {
         case BITSWAP100:
           serialized = msg.serializeToBitswap100()
           break
@@ -282,19 +293,20 @@ export class Network {
           serialized = msg.serializeToBitswap110()
           break
         default:
-          throw new Error(`Unknown protocol: ${stream.stat.protocol}`)
+          throw new Error(`Unknown protocol: ${stream.protocol}`)
       }
 
       await pipe(
         [serialized],
         (source) => lp.encode(source),
         stream
       )
+
+      await stream.close()
     } catch (err: any) {
       options.onProgress?.(new CustomProgressEvent<{ peer: PeerId, error: Error }>('bitswap:network:send-wantlist:error', { peer: peerId, error: err }))
       this._log(err)
-    } finally {
-      stream.close()
+      stream.abort(err)
     }
   }
 }
diff --git a/src/notifications.ts b/src/notifications.ts
@@ -4,7 +4,7 @@ import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import * as CONSTANTS from './constants.js'
 import { logger } from './utils/index.js'
 import type { BitswapWantBlockProgressEvents } from './index.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { Logger } from '@libp2p/logger'
 import type { CID } from 'multiformats/cid'
diff --git a/src/stats/index.ts b/src/stats/index.ts
@@ -1,15 +1,10 @@
 import { EventEmitter } from 'events'
-import { trackedMap } from '@libp2p/tracked-map'
+import { trackedMap } from '@libp2p/interface/metrics/tracked-map'
 import { Stat } from './stat.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { IMovingAverage } from '@vascosantos/moving-average'
 import type { Libp2p } from 'libp2p'
 
-/**
- * @typedef {import('multiformats').CID} CID
- * @typedef {import('@libp2p/interface-peer-id').PeerId} PeerId
- */
-
 export interface StatsOptions {
   enabled?: boolean
   computeThrottleTimeout?: number
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,7 +1,7 @@
 import { logger as createLogger, type Logger } from '@libp2p/logger'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { BitswapMessageEntry } from '../message/entry.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 
 /**
  * Creates a logger for the given subsystem
diff --git a/src/want-manager/index.ts b/src/want-manager/index.ts
@@ -1,4 +1,4 @@
-import { trackedMap } from '@libp2p/tracked-map'
+import { trackedMap } from '@libp2p/interface/metrics/tracked-map'
 import { base58btc } from 'multiformats/bases/base58'
 import * as CONSTANTS from '../constants.js'
 import { BitswapMessage as Message } from '../message/index.js'
@@ -8,8 +8,8 @@ import { MsgQueue } from './msg-queue.js'
 import type { BitswapWantBlockProgressEvents } from '../index.js'
 import type { Network } from '../network.js'
 import type { Stats } from '../stats/index.js'
-import type { Libp2p } from '@libp2p/interface-libp2p'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Libp2p } from '@libp2p/interface'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { Logger } from '@libp2p/logger'
 import type { AbortOptions } from '@multiformats/multiaddr'
 import type { CID } from 'multiformats/cid'
diff --git a/src/want-manager/msg-queue.ts b/src/want-manager/msg-queue.ts
@@ -4,7 +4,7 @@ import { BitswapMessage as Message } from '../message/index.js'
 import { logger } from '../utils/index.js'
 import type { BitswapWantBlockProgressEvents } from '../index.js'
 import type { BitswapNetworkWantProgressEvents, Network } from '../network.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { Logger } from '@libp2p/logger'
 import type { CID } from 'multiformats/cid'
 import type { ProgressOptions } from 'progress-events'
diff --git a/src/wantlist/index.ts b/src/wantlist/index.ts
@@ -1,9 +1,9 @@
-import { trackedMap } from '@libp2p/tracked-map'
+import { trackedMap } from '@libp2p/interface/metrics/tracked-map'
 import { base58btc } from 'multiformats/bases/base58'
 import { Message } from '../message/message.js'
 import { WantListEntry as Entry } from './entry.js'
 import type { Stats } from '../stats/index.js'
-import type { Libp2p } from '@libp2p/interface-libp2p'
+import type { Libp2p } from '@libp2p/interface'
 import type { CID } from 'multiformats/cid'
 
 const WantType = {
diff --git a/test/bitswap-mock-internals.ts b/test/bitswap-mock-internals.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 /* eslint max-nested-callbacks: ["error", 5] */
 
-import { isPeerId, type PeerId } from '@libp2p/interface-peer-id'
+import { isPeerId, type PeerId } from '@libp2p/interface/peer-id'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { expect } from 'aegir/chai'
 import { MemoryBlockstore } from 'blockstore-core/memory'
diff --git a/test/bitswap-stats.ts b/test/bitswap-stats.ts
@@ -8,15 +8,10 @@ import { BitswapMessage as Message } from '../src/message/index.js'
 import { createLibp2pNode } from './utils/create-libp2p-node.js'
 import { makeBlocks } from './utils/make-blocks.js'
 import { makePeerIds } from './utils/make-peer-id.js'
-import type { Libp2p } from '@libp2p/interface-libp2p'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Libp2p } from '@libp2p/interface'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { CID } from 'multiformats/cid'
 
-/**
- * @typedef {import('@libp2p/interface-libp2p').Libp2p} Libp2p
- * @typedef {import('multiformats/cid').CID} CID
- */
-
 const expectedStats = [
   'blocksReceived',
   'dataReceived',
diff --git a/test/bitswap.ts b/test/bitswap.ts
@@ -11,7 +11,7 @@ import { BitswapMessage as Message } from '../src/message/index.js'
 import { createLibp2pNode } from './utils/create-libp2p-node.js'
 import { orderedFinish } from './utils/helpers.js'
 import { makeBlocks } from './utils/make-blocks.js'
-import type { Libp2p } from '@libp2p/interface-libp2p'
+import type { Libp2p } from '@libp2p/interface'
 import type { DualKadDHT } from '@libp2p/kad-dht'
 
 /**
diff --git a/test/decision-engine/decision-engine.ts b/test/decision-engine/decision-engine.ts
@@ -20,7 +20,7 @@ import { makeBlocks } from '../utils/make-blocks.js'
 import { makePeerId, makePeerIds } from '../utils/make-peer-id.js'
 import { mockNetwork } from '../utils/mocks.js'
 import type { Network } from '../../src/network.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 import type { Blockstore } from 'interface-blockstore'
 
 const sum = (nums: number[]): number => nums.reduce((a, b) => a + b, 0)
diff --git a/test/decision-engine/ledger.spec.ts b/test/decision-engine/ledger.spec.ts
@@ -3,7 +3,7 @@
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { expect } from 'aegir/chai'
 import { Ledger } from '../../src/decision-engine/ledger.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 
 describe('Ledger', () => {
   /** @type {} */
diff --git a/test/decision-engine/req-queue.spec.ts b/test/decision-engine/req-queue.spec.ts
@@ -3,7 +3,7 @@
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { expect } from 'aegir/chai'
 import { RequestQueue } from '../../src/decision-engine/req-queue.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 
 describe('Request Queue', () => {
   let peerIds: PeerId[]
diff --git a/test/decision-engine/task-merger.spec.ts b/test/decision-engine/task-merger.spec.ts
@@ -4,7 +4,7 @@ import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { expect } from 'aegir/chai'
 import { RequestQueue } from '../../src/decision-engine/req-queue.js'
 import { DefaultTaskMerger } from '../../src/decision-engine/task-merger.js'
-import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerId } from '@libp2p/interface/peer-id'
 
 interface Task {
   topic: string
diff --git a/test/network/network.node.ts b/test/network/network.node.ts
diff --git a/test/notifications.spec.ts b/test/notifications.spec.ts
diff --git a/test/utils/create-libp2p-node.ts b/test/utils/create-libp2p-node.ts
diff --git a/test/utils/make-peer-id.ts b/test/utils/make-peer-id.ts
diff --git a/test/utils/mocks.ts b/test/utils/mocks.ts
diff --git a/test/wantmanager/msg-queue.spec.ts b/test/wantmanager/msg-queue.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`/** @type {import('aegir').PartialOptions} */`
`3`	`3`	`export default {`
`4`	`4`	`build: {`
`5`		`- bundlesizeMax: '32KB'`
	`5`	`+ bundlesizeMax: '33KB'`
`6`	`6`	`}`
`7`	`7`	`}`