libp2p 0.43.4-eb31274d → 0.44.0

package/src/autonat/index.ts

@@ -150,7 +150,7 @@ export class AutonatService implements Startable {
 
       await pipe(
         source,
-        lp.decode(),
+        (source) => lp.decode(source),
         async function * (stream) {
           const buf = await first(stream)
 
@@ -357,7 +357,7 @@ export class AutonatService implements Startable {
             }
           })
         },
-        lp.encode(),
+        (source) => lp.encode(source),
         // pipe to the stream, not the abortable source other wise we
         // can't tell the remote when a dial timed out..
         data.stream
@@ -446,9 +446,9 @@ export class AutonatService implements Startable {
 
           const buf = await pipe(
             [request],
-            lp.encode(),
+            (source) => lp.encode(source),
             source,
-            lp.decode(),
+            (source) => lp.decode(source),
             async (stream) => await first(stream)
           )
           if (buf == null) {

package/src/connection-manager/dial-queue.ts

@@ -337,7 +337,7 @@ export class DialQueue {
       throw new CodeError('dial with more addresses than allowed', codes.ERR_TOO_MANY_ADDRESSES)
     }
 
-    // append peer id to multiaddrs if it is not already present
+    // ensure the peer id is appended to the multiaddr
     if (peerId != null) {
       const peerIdMultiaddr = `/p2p/${peerId.toString()}`
       dedupedMultiaddrs = dedupedMultiaddrs.map(addr => {
@@ -349,7 +349,8 @@ export class DialQueue {
           return addr
         }
 
-        if (addressPeerId == null) {
+        // append peer id to multiaddr if it is not already present
+        if (addressPeerId !== peerId.toString()) {
           return {
             multiaddr: addr.multiaddr.encapsulate(peerIdMultiaddr),
             isCertified: addr.isCertified
@@ -363,7 +364,6 @@ export class DialQueue {
     const gatedAdrs: Address[] = []
 
     for (const addr of dedupedMultiaddrs) {
-      // @ts-expect-error needs updating in the interface
       if (this.connectionGater.denyDialMultiaddr != null && await this.connectionGater.denyDialMultiaddr(addr.multiaddr)) {
         continue
       }

package/src/fetch/index.ts

@@ -127,9 +127,9 @@ export class FetchService implements Startable {
 
       const result = await pipe(
         [FetchRequest.encode({ identifier: key })],
-        lp.encode(),
+        (source) => lp.encode(source),
         source,
-        lp.decode(),
+        (source) => lp.decode(source),
         async function (source) {
           const buf = await first(source)
 
@@ -184,7 +184,7 @@ export class FetchService implements Startable {
 
     await pipe(
       stream,
-      lp.decode(),
+      (source) => lp.decode(source),
       async function * (source) {
         const buf = await first(source)
 
@@ -215,7 +215,7 @@ export class FetchService implements Startable {
 
         yield FetchResponse.encode(response)
       },
-      lp.encode(),
+      (source) => lp.encode(source),
       stream
     )
   }

package/src/identify/index.ts

@@ -197,7 +197,7 @@ export class IdentifyService implements Startable {
             signedPeerRecord,
             protocols
           })],
-          lp.encode()
+          (source) => lp.encode(source)
         ))
       } catch (err: any) {
         // Just log errors
@@ -266,7 +266,7 @@ export class IdentifyService implements Startable {
       const data = await pipe(
         [],
         source,
-        lp.decode({
+        (source) => lp.decode(source, {
           maxDataLength: this.init.maxIdentifyMessageSize ?? MAX_IDENTIFY_MESSAGE_SIZE
         }),
         async (source) => await first(source)
@@ -431,7 +431,7 @@ export class IdentifyService implements Startable {
       // make stream abortable
       const source = abortableDuplex(stream, timeoutController.signal)
 
-      const msgWithLenPrefix = pipe([message], lp.encode())
+      const msgWithLenPrefix = pipe([message], (source) => lp.encode(source))
       await source.sink(msgWithLenPrefix)
     } catch (err: any) {
       log.error('could not respond to identify request', err)
@@ -461,7 +461,7 @@ export class IdentifyService implements Startable {
       const data = await pipe(
         [],
         source,
-        lp.decode({
+        (source) => lp.decode(source, {
           maxDataLength: this.init.maxIdentifyMessageSize ?? MAX_IDENTIFY_MESSAGE_SIZE
         }),
         async (source) => await first(source)

package/src/insecure/index.ts

@@ -71,8 +71,12 @@ async function encrypt (localId: PeerId, conn: Duplex<Uint8Array>, remoteId?: Pe
   log('write pubkey exchange to peer %p', remoteId)
 
   // Get the Exchange message
-  // @ts-expect-error needs to be generator
   const response = (await lp.decode.fromReader(shake.reader).next()).value
+
+  if (response == null) {
+    throw new Error('Did not read response')
+  }
+
   const id = Exchange.decode(response)
   log('read pubkey exchange from peer %p', remoteId)
 

package/src/libp2p.ts

@@ -354,7 +354,6 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
   }
 
   getDialQueue (): PendingDial[] {
-    // @ts-expect-error needs adding to the API
     return this.components.connectionManager.getDialQueue()
   }
 

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '0.43.4-eb31274d'
+export const version = '0.44.0'
 export const name = 'libp2p'