deps!: bump it-stream-types from 1.0.5 to 2.0.1 (#362)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: achingbrain <[email protected]>
libp2p · Apr 18, 2023 · cdc7747 · cdc7747
1 parent 48d8638
commit cdc7747
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 36 deletions.
diff --git a/packages/interface-connection-encrypter-compliance-tests/package.json b/packages/interface-connection-encrypter-compliance-tests/package.json
@@ -142,7 +142,7 @@
     "it-all": "^3.0.1",
     "it-pair": "^2.0.2",
     "it-pipe": "^3.0.1",
-    "it-stream-types": "^1.0.4",
+    "it-stream-types": "^2.0.1",
     "uint8arrays": "^4.0.2"
   },
   "typedoc": {

diff --git a/packages/interface-connection-encrypter-compliance-tests/src/utils/index.ts b/packages/interface-connection-encrypter-compliance-tests/src/utils/index.ts
@@ -1,12 +1,12 @@
 import { duplexPair } from 'it-pair/duplex'
 import { multiaddr } from '@multiformats/multiaddr'
 import type { MultiaddrConnection } from '@libp2p/interface-connection'
-import type { Duplex } from 'it-stream-types'
+import type { Duplex, Source } from 'it-stream-types'
 
 export function createMaConnPair (): [MultiaddrConnection, MultiaddrConnection] {
   const [local, remote] = duplexPair<Uint8Array>()
 
-  function duplexToMaConn (duplex: Duplex<Uint8Array>): MultiaddrConnection {
+  function duplexToMaConn (duplex: Duplex<AsyncGenerator<Uint8Array>, Source<Uint8Array>, Promise<void>>): MultiaddrConnection {
     const output: MultiaddrConnection = {
       ...duplex,
       close: async () => {},

diff --git a/packages/interface-connection-encrypter/package.json b/packages/interface-connection-encrypter/package.json
@@ -153,8 +153,7 @@
   },
   "dependencies": {
     "@libp2p/interface-peer-id": "^2.0.0",
-    "it-stream-types": "^1.0.4",
-    "uint8arraylist": "^2.1.2"
+    "it-stream-types": "^2.0.1"
   },
   "devDependencies": {
     "aegir": "^38.1.0"

diff --git a/packages/interface-connection-encrypter/src/index.ts b/packages/interface-connection-encrypter/src/index.ts
@@ -1,5 +1,5 @@
 import type { PeerId } from '@libp2p/interface-peer-id'
-import type { Duplex } from 'it-stream-types'
+import type { Duplex, Source } from 'it-stream-types'
 
 /**
  * A libp2p connection encrypter module must be compliant to this interface
@@ -13,18 +13,18 @@ export interface ConnectionEncrypter<Extension = unknown> {
    * pass it for extra verification, otherwise it will be determined during
    * the handshake.
    */
-  secureOutbound: (localPeer: PeerId, connection: Duplex<Uint8Array>, remotePeer?: PeerId) => Promise<SecuredConnection<Extension>>
+  secureOutbound: (localPeer: PeerId, connection: Duplex<AsyncGenerator<Uint8Array>, Source<Uint8Array>, Promise<void>>, remotePeer?: PeerId) => Promise<SecuredConnection<Extension>>
 
   /**
    * Decrypt incoming data. If the remote PeerId is known,
    * pass it for extra verification, otherwise it will be determined during
    * the handshake
    */
-  secureInbound: (localPeer: PeerId, connection: Duplex<Uint8Array>, remotePeer?: PeerId) => Promise<SecuredConnection<Extension>>
+  secureInbound: (localPeer: PeerId, connection: Duplex<AsyncGenerator<Uint8Array>, Source<Uint8Array>, Promise<void>>, remotePeer?: PeerId) => Promise<SecuredConnection<Extension>>
 }
 
 export interface SecuredConnection<Extension = unknown> {
-  conn: Duplex<Uint8Array>
+  conn: Duplex<AsyncGenerator<Uint8Array>, Source<Uint8Array>, Promise<void>>
   remoteExtensions?: Extension
   remotePeer: PeerId
 }
diff --git a/packages/interface-connection-gater/package.json b/packages/interface-connection-gater/package.json
@@ -134,10 +134,7 @@
   "dependencies": {
     "@libp2p/interface-connection": "^4.0.0",
     "@libp2p/interface-peer-id": "^2.0.0",
-    "@libp2p/interfaces": "^3.0.0",
-    "@multiformats/multiaddr": "^12.0.0",
-    "it-stream-types": "^1.0.4",
-    "uint8arraylist": "^2.1.2"
+    "@multiformats/multiaddr": "^12.0.0"
   },
   "devDependencies": {
     "aegir": "^38.1.0"

diff --git a/packages/interface-connection/package.json b/packages/interface-connection/package.json
@@ -155,7 +155,7 @@
     "@libp2p/interface-peer-id": "^2.0.0",
     "@libp2p/interfaces": "^3.0.0",
     "@multiformats/multiaddr": "^12.0.0",
-    "it-stream-types": "^1.0.4",
+    "it-stream-types": "^2.0.1",
     "uint8arraylist": "^2.1.2"
   },
   "devDependencies": {

diff --git a/packages/interface-connection/src/index.ts b/packages/interface-connection/src/index.ts
@@ -1,7 +1,7 @@
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import type * as Status from './status.js'
-import type { Duplex } from 'it-stream-types'
+import type { Duplex, Source } from 'it-stream-types'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { Uint8ArrayList } from 'uint8arraylist'
 
@@ -72,7 +72,7 @@ export interface StreamStat {
  * It may be encrypted and multiplexed depending on the
  * configuration of the nodes.
  */
-export interface Stream extends Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array> {
+export interface Stream extends Duplex<AsyncGenerator<Uint8ArrayList>, Source<Uint8ArrayList | Uint8Array>> {
   /**
    * Closes the stream for **reading** *and* **writing**.
    *
@@ -183,7 +183,7 @@ export interface MultiaddrConnectionTimeline {
  * a peer. It is a low-level primitive and is the raw connection
  * without encryption or stream multiplexing.
  */
-export interface MultiaddrConnection extends Duplex<Uint8Array> {
+export interface MultiaddrConnection extends Duplex<AsyncGenerator<Uint8Array>, Source<Uint8Array>, Promise<void>> {
   close: (err?: Error) => Promise<void>
   remoteAddr: Multiaddr
   timeline: MultiaddrConnectionTimeline

diff --git a/packages/interface-mocks/package.json b/packages/interface-mocks/package.json
@@ -153,20 +153,20 @@
     "@libp2p/interface-transport": "^2.0.0",
     "@libp2p/interfaces": "^3.0.0",
     "@libp2p/logger": "^2.0.0",
-    "@libp2p/multistream-select": "^3.0.0",
+    "@libp2p/multistream-select": "^3.1.6",
     "@libp2p/peer-collections": "^3.0.1",
     "@libp2p/peer-id": "^2.0.0",
     "@libp2p/peer-id-factory": "^2.0.0",
     "@multiformats/multiaddr": "^12.0.0",
     "abortable-iterator": "^4.0.2",
     "any-signal": "^4.1.1",
-    "it-handshake": "^4.0.0",
+    "it-handshake": "^4.1.3",
     "it-map": "^3.0.2",
     "it-ndjson": "^1.0.0",
     "it-pair": "^2.0.2",
     "it-pipe": "^3.0.1",
-    "it-pushable": "^3.0.0",
-    "it-stream-types": "^1.0.4",
+    "it-pushable": "^3.1.3",
+    "it-stream-types": "^2.0.1",
     "merge-options": "^3.0.4",
     "uint8arraylist": "^2.1.2",
     "uint8arrays": "^4.0.2"

diff --git a/packages/interface-mocks/src/connection-encrypter.ts b/packages/interface-mocks/src/connection-encrypter.ts
@@ -9,7 +9,7 @@ import type { Transform, Source } from 'it-stream-types'
 import map from 'it-map'
 
 // A basic transform that does nothing to the data
-const transform = <T>(): Transform<T, T> => {
+const transform = <T>(): Transform<Source<T>, AsyncGenerator<T>> => {
   return (source: Source<T>) => (async function * () {
     for await (const chunk of source) {
       yield chunk

diff --git a/packages/interface-mocks/src/connection.ts b/packages/interface-mocks/src/connection.ts
@@ -2,7 +2,7 @@ import { peerIdFromString } from '@libp2p/peer-id'
 import { pipe } from 'it-pipe'
 import { duplexPair } from 'it-pair/duplex'
 import type { MultiaddrConnection, Connection, Stream, ConnectionStat, Direction } from '@libp2p/interface-connection'
-import type { Duplex } from 'it-stream-types'
+import type { Duplex, Source } from 'it-stream-types'
 import { mockMuxer } from './muxer.js'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import { mockMultiaddrConnection } from './multiaddr-connection.js'
@@ -79,7 +79,7 @@ class MockConnection implements Connection {
     }
 
     const id = `${Math.random()}`
-    const stream: Stream = await this.muxer.newStream(id)
+    const stream = await this.muxer.newStream(id)
     const result = await mss.select(stream, protocols, options)
 
     const streamWithProtocol: Stream = {
@@ -170,7 +170,7 @@ export function mockConnection (maConn: MultiaddrConnection, opts: MockConnectio
   return connection
 }
 
-export function mockStream (stream: Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>): Stream {
+export function mockStream (stream: Duplex<AsyncGenerator<Uint8ArrayList>, Source<Uint8ArrayList | Uint8Array>>): Stream {
   return {
     ...stream,
     close: () => {},

diff --git a/packages/interface-mocks/src/duplex.ts b/packages/interface-mocks/src/duplex.ts
@@ -1,6 +1,6 @@
 import type { Duplex } from 'it-stream-types'
 
-export function mockDuplex (): Duplex<Uint8Array> {
+export function mockDuplex (): Duplex<Iterable<Uint8Array>> {
   return {
     source: [],
     sink: async () => {}

diff --git a/packages/interface-mocks/src/multiaddr-connection.ts b/packages/interface-mocks/src/multiaddr-connection.ts
@@ -6,7 +6,7 @@ import type { Duplex } from 'it-stream-types'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
-export function mockMultiaddrConnection (source: Duplex<Uint8Array> & Partial<MultiaddrConnection>, peerId: PeerId): MultiaddrConnection {
+export function mockMultiaddrConnection (source: Duplex<AsyncGenerator<Uint8Array>> & Partial<MultiaddrConnection>, peerId: PeerId): MultiaddrConnection {
   const maConn: MultiaddrConnection = {
     async close () {
 

diff --git a/packages/interface-mocks/src/muxer.ts b/packages/interface-mocks/src/muxer.ts
@@ -263,7 +263,7 @@ class MuxedStream {
 }
 
 class MockMuxer implements StreamMuxer {
-  public source: Source<Uint8Array>
+  public source: AsyncGenerator<Uint8Array>
   public input: Pushable<Uint8Array>
   public streamInput: Pushable<StreamMessage>
   public name: string
@@ -298,7 +298,7 @@ class MockMuxer implements StreamMuxer {
   }
 
   // receive incoming messages
-  async sink (source: Source<Uint8Array>): Promise<void> {
+  async sink (source: Source<Uint8ArrayList | Uint8Array>): Promise<void> {
     try {
       await pipe(
         abortableSource(source, this.closeController.signal),

diff --git a/packages/interface-pubsub/package.json b/packages/interface-pubsub/package.json
@@ -135,7 +135,7 @@
     "@libp2p/interface-connection": "^4.0.0",
     "@libp2p/interface-peer-id": "^2.0.0",
     "@libp2p/interfaces": "^3.0.0",
-    "it-pushable": "^3.0.0",
+    "it-pushable": "^3.1.3",
     "uint8arraylist": "^2.1.2"
   },
   "devDependencies": {

diff --git a/packages/interface-stream-muxer-compliance-tests/package.json b/packages/interface-stream-muxer-compliance-tests/package.json
@@ -143,7 +143,7 @@
     "it-map": "^3.0.2",
     "it-pair": "^2.0.2",
     "it-pipe": "^3.0.1",
-    "it-stream-types": "^1.0.4",
+    "it-stream-types": "^2.0.1",
     "p-defer": "^4.0.0",
     "p-limit": "^4.0.0",
     "uint8arraylist": "^2.1.2",

diff --git a/packages/interface-stream-muxer-compliance-tests/src/close-test.ts b/packages/interface-stream-muxer-compliance-tests/src/close-test.ts
@@ -302,7 +302,6 @@ export default (common: TestSetup<StreamMuxerFactory>): void => {
 
       // Source should be done
       void Promise.resolve().then(async () => {
-        // @ts-expect-error next is part of the iterable protocol
         expect(await stream.source.next()).to.have.property('done', true)
         await stream.sink(data)
       })

diff --git a/packages/interface-stream-muxer/package.json b/packages/interface-stream-muxer/package.json
@@ -134,7 +134,8 @@
   "dependencies": {
     "@libp2p/interface-connection": "^4.0.0",
     "@libp2p/interfaces": "^3.0.0",
-    "it-stream-types": "^1.0.4"
+    "it-stream-types": "^2.0.1",
+    "uint8arraylist": "^2.4.3"
   },
   "devDependencies": {
     "aegir": "^38.1.0"

diff --git a/packages/interface-stream-muxer/src/index.ts b/packages/interface-stream-muxer/src/index.ts
@@ -1,6 +1,7 @@
-import type { Duplex } from 'it-stream-types'
+import type { Duplex, Source } from 'it-stream-types'
 import type { Direction, Stream } from '@libp2p/interface-connection'
 import type { AbortOptions } from '@libp2p/interfaces'
+import type { Uint8ArrayList } from 'uint8arraylist'
 
 export interface StreamMuxerFactory {
   /**
@@ -17,7 +18,7 @@ export interface StreamMuxerFactory {
 /**
  * A libp2p stream muxer
  */
-export interface StreamMuxer extends Duplex<Uint8Array> {
+export interface StreamMuxer extends Duplex<AsyncGenerator<Uint8Array>, Source<Uint8ArrayList | Uint8Array>, Promise<void>> {
   /**
    * The protocol used to select this muxer during connection opening
    */

diff --git a/packages/interface-transport/package.json b/packages/interface-transport/package.json
@@ -136,7 +136,7 @@
     "@libp2p/interface-stream-muxer": "^3.0.0",
     "@libp2p/interfaces": "^3.0.0",
     "@multiformats/multiaddr": "^12.0.0",
-    "it-stream-types": "^1.0.4"
+    "it-stream-types": "^2.0.1"
   },
   "devDependencies": {
     "aegir": "^38.1.0"