libp2p 2.10.0 → 3.0.0-049bfa0fa

package/dist/src/connection.js

@@ -1,94 +1,96 @@
-import { connectionSymbol, LimitedConnectionError, ConnectionClosedError, ConnectionClosingError, TooManyOutboundProtocolStreamsError, TooManyInboundProtocolStreamsError } from '@libp2p/interface';
+import { connectionSymbol, LimitedConnectionError, ConnectionClosedError, TooManyOutboundProtocolStreamsError, TooManyInboundProtocolStreamsError, StreamCloseEvent } from '@libp2p/interface';
 import * as mss from '@libp2p/multistream-select';
-import { setMaxListeners } from 'main-event';
-import { PROTOCOL_NEGOTIATION_TIMEOUT } from "./connection-manager/constants.defaults.js";
+import { CODE_P2P } from '@multiformats/multiaddr';
+import { setMaxListeners, TypedEventEmitter } from 'main-event';
+import { CONNECTION_CLOSE_TIMEOUT, PROTOCOL_NEGOTIATION_TIMEOUT } from "./connection-manager/constants.defaults.js";
+import { isDirect } from "./connection-manager/utils.js";
 import { MuxerUnavailableError } from "./errors.js";
 import { DEFAULT_MAX_INBOUND_STREAMS, DEFAULT_MAX_OUTBOUND_STREAMS } from "./registrar.js";
-const CLOSE_TIMEOUT = 500;
 /**
  * An implementation of the js-libp2p connection.
  * Any libp2p transport should use an upgrader to return this connection.
  */
-export class Connection {
+export class Connection extends TypedEventEmitter {
     id;
     remoteAddr;
     remotePeer;
     direction;
     timeline;
+    direct;
     multiplexer;
     encryption;
-    status;
     limits;
     log;
-    tags;
     maConn;
     muxer;
     components;
     outboundStreamProtocolNegotiationTimeout;
     inboundStreamProtocolNegotiationTimeout;
+    closeTimeout;
     constructor(components, init) {
+        super();
         this.components = components;
         this.id = init.id;
         this.remoteAddr = init.maConn.remoteAddr;
         this.remotePeer = init.remotePeer;
         this.direction = init.direction ?? 'outbound';
-        this.status = 'open';
         this.timeline = init.maConn.timeline;
-        this.encryption = init.encryption;
+        this.encryption = init.cryptoProtocol;
         this.limits = init.limits;
         this.maConn = init.maConn;
         this.log = init.maConn.log;
         this.outboundStreamProtocolNegotiationTimeout = init.outboundStreamProtocolNegotiationTimeout ?? PROTOCOL_NEGOTIATION_TIMEOUT;
         this.inboundStreamProtocolNegotiationTimeout = init.inboundStreamProtocolNegotiationTimeout ?? PROTOCOL_NEGOTIATION_TIMEOUT;
-        if (this.remoteAddr.getPeerId() == null) {
+        this.closeTimeout = init.closeTimeout ?? CONNECTION_CLOSE_TIMEOUT;
+        this.direct = isDirect(init.maConn.remoteAddr);
+        this.onIncomingStream = this.onIncomingStream.bind(this);
+        if (this.remoteAddr.getComponents().find(component => component.code === CODE_P2P) == null) {
             this.remoteAddr = this.remoteAddr.encapsulate(`/p2p/${this.remotePeer}`);
         }
-        this.tags = [];
-        if (init.muxerFactory != null) {
-            this.multiplexer = init.muxerFactory.protocol;
-            this.muxer = init.muxerFactory.createStreamMuxer({
-                direction: this.direction,
-                log: this.log,
-                // Run anytime a remote stream is created
-                onIncomingStream: (stream) => {
-                    this.onIncomingStream(stream);
-                }
-            });
-            // Pipe all data through the muxer
-            void Promise.all([
-                this.muxer.sink(this.maConn.source),
-                this.maConn.sink(this.muxer.source)
-            ]).catch(err => {
-                this.log.error('error piping data through muxer - %e', err);
-            });
+        if (init.muxer != null) {
+            this.multiplexer = init.muxer.protocol;
+            this.muxer = init.muxer;
+            this.muxer.addEventListener('stream', this.onIncomingStream);
         }
+        this.maConn.addEventListener('close', (evt) => {
+            this.dispatchEvent(new StreamCloseEvent(evt.local, evt.error));
+        });
     }
     [Symbol.toStringTag] = 'Connection';
     [connectionSymbol] = true;
     get streams() {
         return this.muxer?.streams ?? [];
     }
+    get status() {
+        return this.maConn.status;
+    }
     /**
      * Create a new stream over this connection
      */
     newStream = async (protocols, options = {}) => {
-        if (this.status === 'closing') {
-            throw new ConnectionClosingError('the connection is being closed');
+        if (this.muxer == null) {
+            throw new MuxerUnavailableError('Connection is not multiplexed');
         }
-        if (this.status === 'closed') {
-            throw new ConnectionClosedError('the connection is closed');
+        if (this.muxer.status !== 'open') {
+            throw new ConnectionClosedError(`The connection muxer is "${this.muxer.status}" and not "open"`);
         }
-        if (!Array.isArray(protocols)) {
-            protocols = [protocols];
+        if (this.maConn.status !== 'open') {
+            throw new ConnectionClosedError(`The connection is "${this.status}" and not "open"`);
         }
         if (this.limits != null && options?.runOnLimitedConnection !== true) {
             throw new LimitedConnectionError('Cannot open protocol stream on limited connection');
         }
-        if (this.muxer == null) {
-            throw new MuxerUnavailableError('Connection is not multiplexed');
+        if (!Array.isArray(protocols)) {
+            protocols = [protocols];
         }
         this.log.trace('starting new stream for protocols %s', protocols);
-        const muxedStream = await this.muxer.newStream();
+        const muxedStream = await this.muxer.createStream({
+            ...options,
+            // most underlying transports only support negotiating a single protocol
+            // so only pass the early protocol if a single protocol has been requested
+            // otherwise fall back to mss
+            protocol: protocols.length === 1 ? protocols[0] : undefined
+        });
         this.log.trace('started new stream %s for protocols %s', muxedStream.id, protocols);
         try {
             if (options.signal == null) {
@@ -100,153 +102,128 @@ export class Connection {
                     signal
                 };
             }
-            muxedStream.log.trace('selecting protocol from protocols %s', protocols);
-            const { stream, protocol } = await mss.select(muxedStream, protocols, {
-                ...options,
-                log: muxedStream.log,
-                yieldBytes: true
-            });
-            muxedStream.log('selected protocol %s', protocol);
-            const outgoingLimit = findOutgoingStreamLimit(protocol, this.components.registrar, options);
-            const streamCount = countStreams(protocol, 'outbound', this);
-            if (streamCount >= outgoingLimit) {
-                const err = new TooManyOutboundProtocolStreamsError(`Too many outbound protocol streams for protocol "${protocol}" - ${streamCount}/${outgoingLimit}`);
+            if (muxedStream.protocol === '') {
+                muxedStream.log.trace('selecting protocol from protocols %s', protocols);
+                muxedStream.protocol = await mss.select(muxedStream, protocols, options);
+                muxedStream.log('negotiated protocol %s', muxedStream.protocol);
+            }
+            else {
+                muxedStream.log('pre-negotiated protocol %s', muxedStream.protocol);
+            }
+            const outgoingLimit = findOutgoingStreamLimit(muxedStream.protocol, this.components.registrar, options);
+            const streamCount = countStreams(muxedStream.protocol, 'outbound', this);
+            if (streamCount > outgoingLimit) {
+                const err = new TooManyOutboundProtocolStreamsError(`Too many outbound protocol streams for protocol "${muxedStream.protocol}" - ${streamCount}/${outgoingLimit}`);
                 muxedStream.abort(err);
                 throw err;
             }
             // If a protocol stream has been successfully negotiated and is to be passed to the application,
             // the peer store should ensure that the peer is registered with that protocol
             await this.components.peerStore.merge(this.remotePeer, {
-                protocols: [protocol]
+                protocols: [muxedStream.protocol]
             });
-            // after the handshake the returned stream can have early data so override
-            // the source/sink
-            muxedStream.source = stream.source;
-            muxedStream.sink = stream.sink;
-            muxedStream.protocol = protocol;
-            // allow closing the write end of a not-yet-negotiated stream
-            if (stream.closeWrite != null) {
-                muxedStream.closeWrite = stream.closeWrite;
-            }
-            // allow closing the read end of a not-yet-negotiated stream
-            if (stream.closeRead != null) {
-                muxedStream.closeRead = stream.closeRead;
-            }
-            // make sure we don't try to negotiate a stream we are closing
-            if (stream.close != null) {
-                muxedStream.close = stream.close;
-            }
-            this.components.metrics?.trackProtocolStream(muxedStream, this);
-            muxedStream.direction = 'outbound';
-            return muxedStream;
+            this.components.metrics?.trackProtocolStream(muxedStream);
+            const middleware = this.components.registrar.getMiddleware(muxedStream.protocol);
+            return await this.runMiddlewareChain(muxedStream, this, middleware);
         }
         catch (err) {
-            this.log.error('could not create new outbound stream on connection %s %a for protocols %s - %e', this.direction === 'inbound' ? 'from' : 'to', this.remoteAddr, protocols, err);
-            if (muxedStream.timeline.close == null) {
+            if (muxedStream.status === 'open') {
                 muxedStream.abort(err);
             }
+            else {
+                this.log.error('could not create new outbound stream on connection %s %a for protocols %s - %e', this.direction === 'inbound' ? 'from' : 'to', this.remoteAddr, protocols, err);
+            }
             throw err;
         }
     };
-    onIncomingStream(muxedStream) {
+    async onIncomingStream(evt) {
+        const muxedStream = evt.detail;
         const signal = AbortSignal.timeout(this.inboundStreamProtocolNegotiationTimeout);
         setMaxListeners(Infinity, signal);
-        void Promise.resolve()
-            .then(async () => {
-            const protocols = this.components.registrar.getProtocols();
-            const { stream, protocol } = await mss.handle(muxedStream, protocols, {
-                signal,
-                log: muxedStream.log,
-                yieldBytes: false
-            });
-            this.log('incoming %s stream opened', protocol);
-            const incomingLimit = findIncomingStreamLimit(protocol, this.components.registrar);
-            const streamCount = countStreams(protocol, 'inbound', this);
-            if (streamCount === incomingLimit) {
-                const err = new TooManyInboundProtocolStreamsError(`Too many inbound protocol streams for protocol "${protocol}" - limit ${incomingLimit}`);
-                muxedStream.abort(err);
-                throw err;
-            }
-            // after the handshake the returned stream can have early data so override
-            // the source/sink
-            muxedStream.source = stream.source;
-            muxedStream.sink = stream.sink;
-            muxedStream.protocol = protocol;
-            // allow closing the write end of a not-yet-negotiated stream
-            if (stream.closeWrite != null) {
-                muxedStream.closeWrite = stream.closeWrite;
+        muxedStream.log('start protocol negotiation, timing out after %dms', this.inboundStreamProtocolNegotiationTimeout);
+        try {
+            if (muxedStream.protocol === '') {
+                const protocols = this.components.registrar.getProtocols();
+                muxedStream.log.trace('selecting protocol from protocols %s', protocols);
+                muxedStream.protocol = await mss.handle(muxedStream, protocols, {
+                    signal
+                });
+                muxedStream.log('negotiated protocol %s', muxedStream.protocol);
             }
-            // allow closing the read end of a not-yet-negotiated stream
-            if (stream.closeRead != null) {
-                muxedStream.closeRead = stream.closeRead;
+            else {
+                muxedStream.log('pre-negotiated protocol %s', muxedStream.protocol);
             }
-            // make sure we don't try to negotiate a stream we are closing
-            if (stream.close != null) {
-                muxedStream.close = stream.close;
+            const incomingLimit = findIncomingStreamLimit(muxedStream.protocol, this.components.registrar);
+            const streamCount = countStreams(muxedStream.protocol, 'inbound', this);
+            if (streamCount > incomingLimit) {
+                throw new TooManyInboundProtocolStreamsError(`Too many inbound protocol streams for protocol "${muxedStream.protocol}" - limit ${incomingLimit}`);
             }
             // If a protocol stream has been successfully negotiated and is to be passed to the application,
             // the peer store should ensure that the peer is registered with that protocol
             await this.components.peerStore.merge(this.remotePeer, {
-                protocols: [protocol]
+                protocols: [muxedStream.protocol]
             }, {
                 signal
             });
-            this.components.metrics?.trackProtocolStream(muxedStream, this);
-            const { handler, options } = this.components.registrar.getHandler(protocol);
+            this.components.metrics?.trackProtocolStream(muxedStream);
+            const { handler, options } = this.components.registrar.getHandler(muxedStream.protocol);
             if (this.limits != null && options.runOnLimitedConnection !== true) {
                 throw new LimitedConnectionError('Cannot open protocol stream on limited connection');
             }
-            await handler({ connection: this, stream: muxedStream });
-        })
-            .catch(async (err) => {
-            this.log.error('error handling incoming stream id %s - %e', muxedStream.id, err);
+            const middleware = this.components.registrar.getMiddleware(muxedStream.protocol);
+            middleware.push(async (stream, connection, next) => {
+                await handler(stream, connection);
+                next(stream, connection);
+            });
+            await this.runMiddlewareChain(muxedStream, this, middleware);
+        }
+        catch (err) {
             muxedStream.abort(err);
-        });
+        }
+    }
+    async runMiddlewareChain(stream, connection, middleware) {
+        for (let i = 0; i < middleware.length; i++) {
+            const mw = middleware[i];
+            stream.log.trace('running middleware', i, mw);
+            // eslint-disable-next-line no-loop-func
+            await new Promise((resolve, reject) => {
+                try {
+                    const result = mw(stream, connection, (s, c) => {
+                        stream = s;
+                        connection = c;
+                        resolve();
+                    });
+                    if (result instanceof Promise) {
+                        result.catch(reject);
+                    }
+                }
+                catch (err) {
+                    reject(err);
+                }
+            });
+            stream.log.trace('ran middleware', i, mw);
+        }
+        return stream;
     }
     /**
      * Close the connection
      */
     async close(options = {}) {
-        if (this.status === 'closed' || this.status === 'closing') {
-            return;
-        }
         this.log('closing connection to %a', this.remoteAddr);
-        this.status = 'closing';
         if (options.signal == null) {
-            const signal = AbortSignal.timeout(CLOSE_TIMEOUT);
+            const signal = AbortSignal.timeout(this.closeTimeout);
             setMaxListeners(Infinity, signal);
             options = {
                 ...options,
                 signal
             };
         }
-        try {
-            this.log.trace('closing underlying transport');
-            // ensure remaining streams are closed gracefully
-            await this.muxer?.close(options);
-            // close the underlying transport
-            await this.maConn.close(options);
-            this.log.trace('updating timeline with close time');
-            this.status = 'closed';
-            this.timeline.close = Date.now();
-        }
-        catch (err) {
-            this.log.error('error encountered during graceful close of connection to %a', this.remoteAddr, err);
-            this.abort(err);
-        }
+        await this.muxer?.close(options);
+        await this.maConn.close(options);
     }
     abort(err) {
-        if (this.status === 'closed') {
-            return;
-        }
-        this.log.error('aborting connection to %a due to error', this.remoteAddr, err);
-        this.status = 'closing';
-        // ensure remaining streams are aborted
         this.muxer?.abort(err);
-        // abort the underlying transport
         this.maConn.abort(err);
-        this.status = 'closed';
-        this.timeline.close = Date.now();
     }
 }
 export function createConnection(components, init) {
@@ -255,7 +232,9 @@ export function createConnection(components, init) {
 function findIncomingStreamLimit(protocol, registrar) {
     try {
         const { options } = registrar.getHandler(protocol);
-        return options.maxInboundStreams;
+        if (options.maxInboundStreams != null) {
+            return options.maxInboundStreams;
+        }
     }
     catch (err) {
         if (err.name !== 'UnhandledProtocolError') {

package/dist/src/connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,mCAAmC,EAAE,kCAAkC,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAC9L,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,MAAM,4CAA4C,CAAA;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAA;AAyB1F;;;GAGG;AACH,MAAM,OAAO,UAAW,SAAQ,iBAAsC;IACpD,EAAE,CAAQ;IACV,UAAU,CAAW;IACrB,UAAU,CAAQ;IAC3B,SAAS,CAAwB;IACjC,QAAQ,CAA6B;IACrC,MAAM,CAAS;IACf,WAAW,CAAS;IACpB,UAAU,CAAS;IACnB,MAAM,CAAmB;IAChB,GAAG,CAAQ;IAEV,MAAM,CAAqB;IAC3B,KAAK,CAAc;IACnB,UAAU,CAAsB;IAChC,wCAAwC,CAAQ;IAChD,uCAAuC,CAAQ;IAC/C,YAAY,CAAQ;IAErC,YAAa,UAAgC,EAAE,IAAoB;QACjE,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAE5B,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;QACjB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA;QACxC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;QACjC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,UAAU,CAAA;QAC7C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;QACpC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAA;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QACzB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAA;QAC1B,IAAI,CAAC,wCAAwC,GAAG,IAAI,CAAC,wCAAwC,IAAI,4BAA4B,CAAA;QAC7H,IAAI,CAAC,uCAAuC,GAAG,IAAI,CAAC,uCAAuC,IAAI,4BAA4B,CAAA;QAC3H,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,wBAAwB,CAAA;QACjE,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAE9C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAExD,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;YAC3F,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QAC1E,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAA;YACtC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;YACvB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC9D,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC5C,IAAI,CAAC,aAAa,CAAC,IAAI,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;QAChE,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,YAAY,CAAA;IAEnC,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAA;IAElC,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAA;IAClC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IAC3B,CAAC;IAED;;OAEG;IACH,SAAS,GAAG,KAAK,EAAE,SAAmB,EAAE,UAA4B,EAAE,EAAmB,EAAE;QACzF,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,qBAAqB,CAAC,+BAA+B,CAAC,CAAA;QAClE,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACjC,MAAM,IAAI,qBAAqB,CAAC,4BAA4B,IAAI,CAAC,KAAK,CAAC,MAAM,kBAAkB,CAAC,CAAA;QAClG,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAClC,MAAM,IAAI,qBAAqB,CAAC,sBAAsB,IAAI,CAAC,MAAM,kBAAkB,CAAC,CAAA;QACtF,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,OAAO,EAAE,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACpE,MAAM,IAAI,sBAAsB,CAAC,mDAAmD,CAAC,CAAA;QACvF,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAA;QACzB,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,SAAS,CAAC,CAAA;QACjE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;YAChD,GAAG,OAAO;YAEV,wEAAwE;YACxE,0EAA0E;YAC1E,6BAA6B;YAC7B,QAAQ,EAAE,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;SAC5D,CAAC,CAAA;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAwC,EAAE,WAAW,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;QAEnF,IAAI,CAAC;YACH,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC3B,WAAW,CAAC,GAAG,CAAC,mGAAmG,EAAE,SAAS,CAAC,CAAA;gBAE/H,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAA;gBACjF,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;gBAEjC,OAAO,GAAG;oBACR,GAAG,OAAO;oBACV,MAAM;iBACP,CAAA;YACH,CAAC;YAED,IAAI,WAAW,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;gBAChC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,SAAS,CAAC,CAAA;gBAExE,WAAW,CAAC,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;gBAExE,WAAW,CAAC,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;YACjE,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,GAAG,CAAC,4BAA4B,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;YACrE,CAAC;YAED,MAAM,aAAa,GAAG,uBAAuB,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YACvG,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;YAExE,IAAI,WAAW,GAAG,aAAa,EAAE,CAAC;gBAChC,MAAM,GAAG,GAAG,IAAI,mCAAmC,CAAC,oDAAoD,WAAW,CAAC,QAAQ,OAAO,WAAW,IAAI,aAAa,EAAE,CAAC,CAAA;gBAClK,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAEtB,MAAM,GAAG,CAAA;YACX,CAAC;YAED,gGAAgG;YAChG,8EAA8E;YAC9E,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE;gBACrD,SAAS,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;aAClC,CAAC,CAAA;YAEF,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAA;YAEzD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YAEhF,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;QACrE,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,WAAW,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBAClC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACxB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gFAAgF,EAAE,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;YACjL,CAAC;YAED,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC,CAAA;IAEO,KAAK,CAAC,gBAAgB,CAAE,GAAwB;QACtD,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;QAE9B,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;QAChF,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAEjC,WAAW,CAAC,GAAG,CAAC,mDAAmD,EAAE,IAAI,CAAC,uCAAuC,CAAC,CAAA;QAElH,IAAI,CAAC;YACH,IAAI,WAAW,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;gBAChC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,YAAY,EAAE,CAAA;gBAE1D,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,SAAS,CAAC,CAAA;gBAExE,WAAW,CAAC,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE;oBAC9D,MAAM;iBACP,CAAC,CAAA;gBAEF,WAAW,CAAC,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;YACjE,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,GAAG,CAAC,4BAA4B,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;YACrE,CAAC;YAED,MAAM,aAAa,GAAG,uBAAuB,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;YAC9F,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;YAEvE,IAAI,WAAW,GAAG,aAAa,EAAE,CAAC;gBAChC,MAAM,IAAI,kCAAkC,CAAC,mDAAmD,WAAW,CAAC,QAAQ,aAAa,aAAa,EAAE,CAAC,CAAA;YACnJ,CAAC;YAED,gGAAgG;YAChG,8EAA8E;YAC9E,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE;gBACrD,SAAS,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;aAClC,EAAE;gBACD,MAAM;aACP,CAAC,CAAA;YAEF,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAA;YAEzD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YAEvF,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,OAAO,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;gBACnE,MAAM,IAAI,sBAAsB,CAAC,mDAAmD,CAAC,CAAA;YACvF,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YAEhF,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE;gBACjD,MAAM,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;gBACjC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YAEF,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;QAC9D,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAE,MAAc,EAAE,UAA+B,EAAE,UAA8B;QAC/G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3C,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;YACxB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;YAE7C,wCAAwC;YACxC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;wBAC7C,MAAM,GAAG,CAAC,CAAA;wBACV,UAAU,GAAG,CAAC,CAAA;wBACd,OAAO,EAAE,CAAA;oBACX,CAAC,CAAC,CAAA;oBAEF,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;wBAC9B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;oBACtB,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,GAAG,CAAC,CAAA;gBACb,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAC3C,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAE,UAAwB,EAAE;QACrC,IAAI,CAAC,GAAG,CAAC,0BAA0B,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QAErD,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACrD,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAEjC,OAAO,GAAG;gBACR,GAAG,OAAO;gBACV,MAAM;aACP,CAAA;QACH,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QAChC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAED,KAAK,CAAE,GAAU;QACf,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;CACF;AAED,MAAM,UAAU,gBAAgB,CAAE,UAAgC,EAAE,IAAoB;IACtF,OAAO,IAAI,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AACzC,CAAC;AAED,SAAS,uBAAuB,CAAE,QAAgB,EAAE,SAAoB;IACtE,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAElD,IAAI,OAAO,CAAC,iBAAiB,IAAI,IAAI,EAAE,CAAC;YACtC,OAAO,OAAO,CAAC,iBAAiB,CAAA;QAClC,CAAC;IACH,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,GAAG,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;YAC1C,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAED,OAAO,2BAA2B,CAAA;AACpC,CAAC;AAED,SAAS,uBAAuB,CAAE,QAAgB,EAAE,SAAoB,EAAE,UAA4B,EAAE;IACtG,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAElD,IAAI,OAAO,CAAC,kBAAkB,IAAI,IAAI,EAAE,CAAC;YACvC,OAAO,OAAO,CAAC,kBAAkB,CAAA;QACnC,CAAC;IACH,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,GAAG,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;YAC1C,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,kBAAkB,IAAI,4BAA4B,CAAA;AACnE,CAAC;AAED,SAAS,YAAY,CAAE,QAAgB,EAAE,SAAiC,EAAE,UAAsB;IAChG,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAClC,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACnE,WAAW,EAAE,CAAA;QACf,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC"}

package/dist/src/get-peer.js

@@ -1,6 +1,6 @@
 import { InvalidMultiaddrError, InvalidParametersError, isPeerId } from '@libp2p/interface';
 import { peerIdFromString } from '@libp2p/peer-id';
-import { isMultiaddr } from '@multiformats/multiaddr';
+import { CODE_P2P, isMultiaddr } from '@multiformats/multiaddr';
 import { PEER_ID } from '@multiformats/multiaddr-matcher';
 /**
  * Extracts a PeerId and/or multiaddr from the passed PeerId or Multiaddr or an
@@ -13,14 +13,14 @@ export function getPeerAddress(peer) {
     let multiaddrs = Array.isArray(peer) ? peer : [peer];
     let peerId;
     if (multiaddrs.length > 0) {
-        const peerIdStr = multiaddrs[0].getPeerId();
+        const peerIdStr = multiaddrs[0].getComponents().findLast(c => c.code === CODE_P2P)?.value;
         peerId = peerIdStr == null ? undefined : peerIdFromString(peerIdStr);
         // ensure PeerId is either not set or is consistent
         multiaddrs.forEach(ma => {
             if (!isMultiaddr(ma)) {
                 throw new InvalidMultiaddrError('Invalid multiaddr');
             }
-            const maPeerIdStr = ma.getPeerId();
+            const maPeerIdStr = ma.getComponents().findLast(c => c.code === CODE_P2P)?.value;
             if (maPeerIdStr == null) {
                 if (peerId != null) {
                     throw new InvalidParametersError('Multiaddrs must all have the same peer id or have no peer id');

package/dist/src/get-peer.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-peer.js","sourceRoot":"","sources":["../../src/get-peer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AASzD;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAE,IAAsC;IACpE,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;IACzC,CAAC;IAED,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAEpD,IAAI,MAA0B,CAAA;IAE9B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;QAC3C,MAAM,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;QAEpE,mDAAmD;QACnD,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACtB,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,qBAAqB,CAAC,mBAAmB,CAAC,CAAA;YACtD,CAAC;YAED,MAAM,WAAW,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;YAElC,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;gBACxB,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACnB,MAAM,IAAI,sBAAsB,CAAC,8DAA8D,CAAC,CAAA;gBAClG,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAA;gBAE9C,IAAI,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;oBACtC,MAAM,IAAI,sBAAsB,CAAC,8DAA8D,CAAC,CAAA;gBAClG,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,4EAA4E;IAC5E,sCAAsC;IACtC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QAClC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;IAChC,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,MAAM;QACN,UAAU;KACX,CAAA;AACH,CAAC"}
+{"version":3,"file":"get-peer.js","sourceRoot":"","sources":["../../src/get-peer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AASzD;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAE,IAAsC;IACpE,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;IACzC,CAAC;IAED,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAEpD,IAAI,MAA0B,CAAA;IAE9B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE,KAAK,CAAA;QACzF,MAAM,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;QAEpE,mDAAmD;QACnD,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACtB,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,qBAAqB,CAAC,mBAAmB,CAAC,CAAA;YACtD,CAAC;YAED,MAAM,WAAW,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE,KAAK,CAAA;YAEhF,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;gBACxB,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACnB,MAAM,IAAI,sBAAsB,CAAC,8DAA8D,CAAC,CAAA;gBAClG,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAA;gBAE9C,IAAI,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;oBACtC,MAAM,IAAI,sBAAsB,CAAC,8DAA8D,CAAC,CAAA;gBAClG,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,4EAA4E;IAC5E,sCAAsC;IACtC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QAClC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;IAChC,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,MAAM;QACN,UAAU;KACX,CAAA;AACH,CAAC"}

package/dist/src/index.d.ts

@@ -155,8 +155,8 @@ export type Libp2pOptions<T extends ServiceMap = ServiceMap> = Libp2pInit<T> & {
  * import { createLibp2p } from 'libp2p'
  * import { tcp } from '@libp2p/tcp'
  * import { mplex } from '@libp2p/mplex'
- * import { noise } from '@chainsafe/libp2p-noise'
- * import { yamux } from '@chainsafe/libp2p-yamux'
+ * import { noise } from '@libp2p/noise'
+ * import { yamux } from '@libp2p/yamux'
  *
  * // specify options
  * const options = {

package/dist/src/index.js

@@ -30,8 +30,8 @@ export { dnsaddrResolver } from "./connection-manager/resolvers/index.js";
  * import { createLibp2p } from 'libp2p'
  * import { tcp } from '@libp2p/tcp'
  * import { mplex } from '@libp2p/mplex'
- * import { noise } from '@chainsafe/libp2p-noise'
- * import { yamux } from '@chainsafe/libp2p-yamux'
+ * import { noise } from '@libp2p/noise'
+ * import { yamux } from '@libp2p/yamux'
  *
  * // specify options
  * const options = {

package/dist/src/libp2p.d.ts

@@ -1,7 +1,7 @@
 import { TypedEventEmitter } from 'main-event';
 import type { Components } from './components.js';
 import type { Libp2p as Libp2pInterface, Libp2pInit } from './index.js';
-import type { PeerRouting, ContentRouting, Libp2pEvents, PendingDial, ServiceMap, AbortOptions, ComponentLogger, Connection, NewStreamOptions, Stream, Metrics, PeerId, PeerStore, Topology, Libp2pStatus, IsDialableOptions, DialOptions, PublicKey, Ed25519PeerId, Secp256k1PeerId, RSAPublicKey, RSAPeerId, URLPeerId, Ed25519PublicKey, Secp256k1PublicKey, StreamHandler, StreamHandlerOptions } from '@libp2p/interface';
+import type { PeerRouting, ContentRouting, Libp2pEvents, PendingDial, ServiceMap, AbortOptions, ComponentLogger, Connection, NewStreamOptions, Stream, Metrics, PeerId, PeerStore, Topology, Libp2pStatus, IsDialableOptions, DialOptions, PublicKey, Ed25519PeerId, Secp256k1PeerId, RSAPublicKey, RSAPeerId, URLPeerId, Ed25519PublicKey, Secp256k1PublicKey, StreamHandler, StreamHandlerOptions, StreamMiddleware } from '@libp2p/interface';
 import type { Multiaddr } from '@multiformats/multiaddr';
 export declare class Libp2p<T extends ServiceMap = ServiceMap> extends TypedEventEmitter<Libp2pEvents> implements Libp2pInterface<T> {
     #private;
@@ -47,6 +47,8 @@ export declare class Libp2p<T extends ServiceMap = ServiceMap> extends TypedEven
     unhandle(protocols: string[] | string, options?: AbortOptions): Promise<void>;
     register(protocol: string, topology: Topology, options?: AbortOptions): Promise<string>;
     unregister(id: string): void;
+    use(protocol: string, middleware: StreamMiddleware | StreamMiddleware[]): void;
+    unuse(protocol: string): void;
     isDialable(multiaddr: Multiaddr, options?: IsDialableOptions): Promise<boolean>;
 }
 //# sourceMappingURL=libp2p.d.ts.map

package/dist/src/libp2p.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAmB,MAAM,YAAY,CAAA;AAgB/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,MAAM,IAAI,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAU,UAAU,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAY,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAChb,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,qBAAa,MAAM,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,iBAAiB,CAAC,YAAY,CAAE,YAAW,eAAe,CAAC,CAAC,CAAC;;IACnH,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;IACpB,cAAc,EAAE,cAAc,CAAA;IAC9B,WAAW,EAAE,WAAW,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,CAAC,CAAA;IACX,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,YAAY,CAAA;IAEpB,UAAU,EAAE,UAAU,GAAG,CAAC,CAAA;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAGf,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE;IAqKrD,OAAO,CAAC,kBAAkB;IAW1B;;OAEG;IACG,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IA0B7B;;OAEG;IACG,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAkB5B,cAAc,CAAE,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,EAAE;IAI9C,YAAY,IAAK,WAAW,EAAE;IAI9B,QAAQ,IAAK,MAAM,EAAE;IAUf,IAAI,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;IAQ7F,YAAY,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB1I,aAAa,IAAK,SAAS,EAAE;IAI7B,YAAY,IAAK,MAAM,EAAE;IAInB,MAAM,CAAE,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlF;;OAEG;IACG,YAAY,CAAE,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACrF,YAAY,CAAE,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;IACzF,YAAY,CAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAC7E,YAAY,CAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC;IACtE,YAAY,CAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC;IAsCvE,MAAM,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5G,QAAQ,CAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9E,QAAQ,CAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAI9F,UAAU,CAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAIvB,UAAU,CAAE,SAAS,EAAE,SAAS,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;CAqB3F"}
+{"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../src/libp2p.ts"],"names":[],"mappings":"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"}

package/dist/src/libp2p.js

@@ -4,7 +4,7 @@ import { defaultLogger } from '@libp2p/logger';
 import { PeerSet } from '@libp2p/peer-collections';
 import { peerIdFromString } from '@libp2p/peer-id';
 import { persistentPeerStore } from '@libp2p/peer-store';
-import { isMultiaddr } from '@multiformats/multiaddr';
+import { CODE_P2P, isMultiaddr } from '@multiformats/multiaddr';
 import { MemoryDatastore } from 'datastore-core/memory';
 import { TypedEventEmitter, setMaxListeners } from 'main-event';
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat';
@@ -97,8 +97,9 @@ export class Libp2p extends TypedEventEmitter {
             connectionEncrypters: (init.connectionEncrypters ?? []).map((fn, index) => this.configureComponent(`connection-encryption-${index}`, fn(this.components))),
             streamMuxers: (init.streamMuxers ?? []).map((fn, index) => this.configureComponent(`stream-muxers-${index}`, fn(this.components))),
             inboundUpgradeTimeout: init.connectionManager?.inboundUpgradeTimeout,
-            inboundStreamProtocolNegotiationTimeout: init.connectionManager?.inboundStreamProtocolNegotiationTimeout ?? init.connectionManager?.protocolNegotiationTimeout,
-            outboundStreamProtocolNegotiationTimeout: init.connectionManager?.outboundStreamProtocolNegotiationTimeout ?? init.connectionManager?.protocolNegotiationTimeout
+            inboundStreamProtocolNegotiationTimeout: init.connectionManager?.inboundStreamProtocolNegotiationTimeout,
+            outboundStreamProtocolNegotiationTimeout: init.connectionManager?.outboundStreamProtocolNegotiationTimeout,
+            connectionCloseTimeout: init.connectionManager?.connectionCloseTimeout
         });
         // Setup the transport manager
         this.configureComponent('transportManager', new DefaultTransportManager(this.components, init.transportManager));
@@ -187,7 +188,7 @@ export class Libp2p extends TypedEventEmitter {
             await this.components.afterStart?.();
             this.status = 'started';
             this.safeDispatchEvent('start', { detail: this });
-            this.log('libp2p has started');
+            this.log('libp2p has started with peer id %p', this.peerId);
         }
         catch (err) {
             this.log.error('An error occurred starting libp2p', err);
@@ -241,8 +242,7 @@ export class Libp2p extends TypedEventEmitter {
         if (protocols.length === 0) {
             throw new InvalidParametersError('no protocols were provided to open a stream');
         }
-        const connection = await this.dial(peer, options);
-        return connection.newStream(protocols, options);
+        return this.components.connectionManager.openStream(peer, protocols, options);
     }
     getMultiaddrs() {
         return this.components.addressManager.getAddresses();
@@ -252,7 +252,7 @@ export class Libp2p extends TypedEventEmitter {
     }
     async hangUp(peer, options = {}) {
         if (isMultiaddr(peer)) {
-            peer = peerIdFromString(peer.getPeerId() ?? '');
+            peer = peerIdFromString(peer.getComponents().findLast(c => c.code === CODE_P2P)?.value ?? '');
         }
         await this.components.connectionManager.closeConnections(peer, options);
     }
@@ -307,6 +307,12 @@ export class Libp2p extends TypedEventEmitter {
     unregister(id) {
         this.components.registrar.unregister(id);
     }
+    use(protocol, middleware) {
+        this.components.registrar.use(protocol, Array.isArray(middleware) ? middleware : [middleware]);
+    }
+    unuse(protocol) {
+        this.components.registrar.unuse(protocol);
+    }
     async isDialable(multiaddr, options = {}) {
         return this.components.connectionManager.isDialable(multiaddr, options);
     }