fix: add backpressure to tls encryption

packages/connection-encrypter-tls/package.json

@@ -56,7 +56,7 @@
     "@peculiar/webcrypto": "^1.5.0",
     "@peculiar/x509": "^1.12.3",
     "asn1js": "^3.0.5",
-    "it-pushable": "^3.2.3",
+    "it-queueless-pushable": "^1.0.2",
     "it-stream-types": "^2.0.2",
     "protons-runtime": "^5.5.0",
     "uint8arraylist": "^2.4.8",

packages/connection-encrypter-tls/src/utils.ts

@@ -7,14 +7,15 @@ import * as asn1X509 from '@peculiar/asn1-x509'
 import { Crypto } from '@peculiar/webcrypto'
 import * as x509 from '@peculiar/x509'
 import * as asn1js from 'asn1js'
-import { pushable } from 'it-pushable'
+import { queuelessPushable } from 'it-queueless-pushable'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { InvalidCertificateError } from './errors.js'
 import { KeyType, PublicKey } from './pb/index.js'
 import type { PeerId, PublicKey as Libp2pPublicKey, Logger, PrivateKey } from '@libp2p/interface'
-import type { Duplex } from 'it-stream-types'
+import type { Pushable } from 'it-queueless-pushable'
+import type { Duplex, Source } from 'it-stream-types'
 import type { Uint8ArrayList } from 'uint8arraylist'
 
 const crypto = new Crypto()
@@ -185,15 +186,19 @@ function formatAsPem (str: string): string {
 }
 
 export function itToStream (conn: Duplex<AsyncGenerator<Uint8Array | Uint8ArrayList>>): DuplexStream {
-  const output = pushable()
+  const output = queuelessPushable<Uint8Array>()
   const iterator = conn.source[Symbol.asyncIterator]() as AsyncGenerator<Uint8Array>
 
   const stream = new DuplexStream({
     autoDestroy: false,
     allowHalfOpen: true,
     write (chunk, encoding, callback) {
-      output.push(chunk)
-      callback()
+      void output.push(chunk)
+        .then(() => {
+          callback()
+        }, err => {
+          callback(err)
+        })
     },
     read () {
       iterator.next()
@@ -218,53 +223,64 @@ export function itToStream (conn: Duplex<AsyncGenerator<Uint8Array | Uint8ArrayL
   return stream
 }
 
-export function streamToIt (stream: DuplexStream): Duplex<AsyncGenerator<Uint8Array | Uint8ArrayList>> {
-  const output: Duplex<AsyncGenerator<Uint8Array | Uint8ArrayList>> = {
-    source: (async function * () {
-      const output = pushable<Uint8Array>()
-
-      stream.addListener('data', (buf) => {
-        output.push(buf.subarray())
-      })
-      // both ends closed
-      stream.addListener('close', () => {
-        output.end()
-      })
-      stream.addListener('error', (err) => {
-        output.end(err)
-      })
-      // just writable end closed
-      stream.addListener('finish', () => {
-        output.end()
-      })
-
-      try {
-        yield * output
-      } catch (err: any) {
-        stream.destroy(err)
-        throw err
-      }
-    })(),
-    sink: async (source) => {
-      try {
-        for await (const buf of source) {
-          const sendMore = stream.write(buf.subarray())
-
-          if (!sendMore) {
-            await waitForBackpressure(stream)
-          }
-        }
+class DuplexIterable implements Duplex<AsyncGenerator<Uint8Array | Uint8ArrayList>> {
+  source: Pushable<Uint8Array>
+  private readonly stream: DuplexStream
+
+  constructor (stream: DuplexStream) {
+    this.stream = stream
+    this.source = queuelessPushable<Uint8Array>()
 
-        // close writable end
-        stream.end()
-      } catch (err: any) {
-        stream.destroy(err)
-        throw err
+    stream.addListener('data', (buf) => {
+      stream.pause()
+      this.source.push(buf.subarray())
+        .then(() => {
+          stream.resume()
+        }, (err) => {
+          stream.emit('error', err)
+        })
+    })
+    // both ends closed
+    stream.addListener('close', () => {
+      this.source.end()
+        .catch(err => {
+          stream.emit('error', err)
+        })
+    })
+    stream.addListener('error', (err) => {
+      this.source.end(err)
+        .catch(() => {})
+    })
+    // just writable end closed
+    stream.addListener('finish', () => {
+      this.source.end()
+        .catch(() => {})
+    })
+
+    this.sink = this.sink.bind(this)
+  }
+
+  async sink (source: Source<Uint8Array | Uint8ArrayList>): Promise<void> {
+    try {
+      for await (const buf of source) {
+        const sendMore = this.stream.write(buf.subarray())
+
+        if (!sendMore) {
+          await waitForBackpressure(this.stream)
+        }
       }
+
+      // close writable end
+      this.stream.end()
+    } catch (err: any) {
+      this.stream.destroy(err)
+      throw err
     }
   }
+}
 
-  return output
+export function streamToIt (stream: DuplexStream): Duplex<AsyncGenerator<Uint8Array | Uint8ArrayList>> {
+  return new DuplexIterable(stream)
 }
 
 async function waitForBackpressure (stream: DuplexStream): Promise<void> {