@libp2p/tcp 1.0.4 → 1.0.5

package/README.md

@@ -41,7 +41,7 @@
 import { TCP } from '@libp2p/tcp'
 import { Multiaddr } from '@multiformats/multiaddr'
 import pipe from 'it-pipe'
-import { collect } from 'streaming-iterables'
+import all from 'it-all'
 
 // A simple upgrader that just returns the MultiaddrConnection
 const upgrader = {
@@ -66,7 +66,7 @@ console.log('listening')
 const socket = await tcp.dial(addr)
 const values = await pipe(
   socket,
-  collect
+  all
 )
 console.log(`Value: ${values.toString()}`)
 

package/dist/src/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import net from 'net';
-import type { Transport, Upgrader, ListenerOptions, Listener } from '@libp2p/interfaces/transport';
+import type { Transport, Upgrader, ListenerOptions } from '@libp2p/interfaces/transport';
 import type { Multiaddr } from '@multiformats/multiaddr';
 /**
  * @typedef {import('multiaddr').Multiaddr} Multiaddr
@@ -25,7 +25,7 @@ export declare class TCP implements Transport<DialOptions, ListenerOptions> {
      * anytime a new incoming Connection has been successfully upgraded via
      * `upgrader.upgradeInbound`.
      */
-    createListener(options?: ListenerOptions): Listener;
+    createListener(options?: ListenerOptions): import("@libp2p/interfaces/transport").Listener;
     /**
      * Takes a list of `Multiaddr`s and returns only valid TCP addresses
      */

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AASrB,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAClG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKxD;;;;;;GAMG;AAEH,UAAU,UAAU;IAClB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,UAAU,WAAW;IACnB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,GAAI,YAAW,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;IACjE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;gBAEvB,OAAO,EAAE,UAAU;IAU1B,IAAI,CAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAE,WAAgB;IAe9C,QAAQ,CAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAE,WAAgB;IA+DxD;;;;OAIG;IACH,cAAc,CAAE,OAAO,GAAE,eAAoB,GAAG,QAAQ;IAIxD;;OAEG;IACH,MAAM,CAAE,UAAU,EAAE,SAAS,EAAE;CAWhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AASrB,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AACxF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKxD;;;;;;GAMG;AAEH,UAAU,UAAU;IAClB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,UAAU,WAAW;IACnB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,GAAI,YAAW,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;IACjE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAU;gBAEvB,OAAO,EAAE,UAAU;IAU1B,IAAI,CAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAE,WAAgB;IAe9C,QAAQ,CAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAE,WAAgB;IA+DxD;;;;OAIG;IACH,cAAc,CAAE,OAAO,GAAE,eAAoB;IAI7C;;OAEG;IACH,MAAM,CAAE,UAAU,EAAE,SAAS,EAAE;CAWhC"}

package/dist/src/listener.d.ts

@@ -1,27 +1,12 @@
-/// <reference types="node" />
-import net from 'net';
-import { EventEmitter } from '@libp2p/interfaces';
 import type { Connection } from '@libp2p/interfaces/connection';
-import type { MultiaddrConnection, Upgrader, Listener, ListenerEvents, ConnectionHandler } from '@libp2p/interfaces/transport';
-import type { Multiaddr } from '@multiformats/multiaddr';
+import type { Upgrader, Listener } from '@libp2p/interfaces/transport';
 interface Context {
     handler?: (conn: Connection) => void;
     upgrader: Upgrader;
 }
-declare class TCPListener extends EventEmitter<ListenerEvents> implements Listener {
-    private peerId?;
-    private listeningAddr?;
-    private readonly server;
-    private connections;
-    constructor(upgrader: Upgrader, handler?: ConnectionHandler);
-    getAddrs(): Multiaddr[];
-    listen(ma: Multiaddr): Promise<void>;
-    close(): Promise<void>;
-    trackConn(maConn: MultiaddrConnection, socket: net.Socket): void;
-}
 /**
  * Create listener
  */
-export declare function createListener(context: Context): TCPListener;
+export declare function createListener(context: Context): Listener;
 export {};
 //# sourceMappingURL=listener.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../../src/listener.ts"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AAQrB,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAA;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAE9H,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAexD,UAAU,OAAO;IACf,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAA;IACpC,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,cAAM,WAAY,SAAQ,YAAY,CAAC,cAAc,CAAE,YAAW,QAAQ;IACxE,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,aAAa,CAAC,CAAW;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAuB;gBAE7B,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAiE5D,QAAQ;IA2BF,MAAM,CAAE,EAAE,EAAE,SAAS;IAuBrB,KAAK;IAcX,SAAS,CAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM;CAS3D;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAE,OAAO,EAAE,OAAO,eAM/C"}
+{"version":3,"file":"listener.d.ts","sourceRoot":"","sources":["../../src/listener.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,EAAuB,QAAQ,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AAqB3F,UAAU,OAAO;IACf,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAA;IACpC,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAE,OAAO,EAAE,OAAO,YAsH/C"}

package/dist/src/listener.js

@@ -16,130 +16,115 @@ async function attemptClose(maConn) {
         log.error('an error occurred closing the connection', err);
     }
 }
-class TCPListener extends EventEmitter {
-    constructor(upgrader, handler) {
-        super();
-        this.connections = [];
-        this.server = net.createServer(socket => {
-            // Avoid uncaught errors caused by unstable connections
-            socket.on('error', err => {
-                log('socket error', err);
+/**
+ * Create listener
+ */
+export function createListener(context) {
+    const { handler, upgrader } = context;
+    let peerId;
+    let listeningAddr;
+    const server = Object.assign(net.createServer(socket => {
+        // Avoid uncaught errors caused by unstable connections
+        socket.on('error', err => {
+            log('socket error', err);
+        });
+        let maConn;
+        try {
+            maConn = toMultiaddrConnection(socket, { listeningAddr });
+        }
+        catch (err) {
+            log.error('inbound connection failed', err);
+            return;
+        }
+        log('new inbound connection %s', maConn.remoteAddr);
+        try {
+            upgrader.upgradeInbound(maConn)
+                .then((conn) => {
+                log('inbound connection %s upgraded', maConn.remoteAddr);
+                trackConn(server, maConn, socket);
+                if (handler != null) {
+                    handler(conn);
+                }
+                listener.dispatchEvent(new CustomEvent('connection', { detail: conn }));
+            })
+                .catch(async (err) => {
+                log.error('inbound connection failed', err);
+                await attemptClose(maConn);
+            })
+                .catch(err => {
+                log.error('closing inbound connection failed', err);
+            });
+        }
+        catch (err) {
+            log.error('inbound connection failed', err);
+            attemptClose(maConn)
+                .catch(err => {
+                log.error('closing inbound connection failed', err);
             });
-            let maConn;
-            try {
-                maConn = toMultiaddrConnection(socket, { listeningAddr: this.listeningAddr });
+        }
+    }), 
+    // Keep track of open connections to destroy in case of timeout
+    { __connections: [] });
+    const listener = Object.assign(new EventEmitter(), {
+        getAddrs: () => {
+            let addrs = [];
+            const address = server.address();
+            if (address == null) {
+                throw new Error('Listener is not ready yet');
             }
-            catch (err) {
-                log.error('inbound connection failed', err);
-                return;
+            if (typeof address === 'string') {
+                throw new Error('Incorrect server address type');
             }
-            log('new inbound connection %s', maConn.remoteAddr);
-            try {
-                upgrader.upgradeInbound(maConn)
-                    .then((conn) => {
-                    log('inbound connection %s upgraded', maConn.remoteAddr);
-                    this.trackConn(maConn, socket);
-                    if (handler != null) {
-                        handler(conn);
-                    }
-                    this.dispatchEvent(new CustomEvent('connection', {
-                        detail: conn
-                    }));
-                })
-                    .catch(async (err) => {
-                    log.error('inbound connection failed', err);
-                    await attemptClose(maConn);
-                })
-                    .catch(err => {
-                    log.error('closing inbound connection failed', err);
-                });
+            // Because TCP will only return the IPv6 version
+            // we need to capture from the passed multiaddr
+            if (listeningAddr.toString().startsWith('/ip4')) {
+                addrs = addrs.concat(getMultiaddrs('ip4', address.address, address.port));
             }
-            catch (err) {
-                log.error('inbound connection failed', err);
-                attemptClose(maConn)
-                    .catch(err => {
-                    log.error('closing inbound connection failed', err);
+            else if (address.family === 'IPv6') {
+                addrs = addrs.concat(getMultiaddrs('ip6', address.address, address.port));
+            }
+            return addrs.map(ma => peerId != null ? ma.encapsulate(`/p2p/${peerId}`) : ma);
+        },
+        listen: async (ma) => {
+            listeningAddr = ma;
+            peerId = ma.getPeerId();
+            if (peerId == null) {
+                listeningAddr = ma.decapsulateCode(CODE_P2P);
+            }
+            return await new Promise((resolve, reject) => {
+                const options = multiaddrToNetConfig(listeningAddr);
+                server.listen(options, (err) => {
+                    if (err != null) {
+                        return reject(err);
+                    }
+                    log('Listening on %s', server.address());
+                    resolve();
                 });
+            });
+        },
+        close: async () => {
+            if (!server.listening) {
+                return;
             }
-        });
-        this.server.on('error', err => {
-            this.dispatchEvent(new CustomEvent('error', {
-                detail: err
-            }));
-        });
-        this.server.on('close', () => {
-            this.dispatchEvent(new CustomEvent('close'));
-        });
-        this.server.on('listening', () => {
-            this.dispatchEvent(new CustomEvent('listening'));
-        });
-    }
-    getAddrs() {
-        let addrs = [];
-        const address = this.server.address();
-        if (address == null) {
-            throw new Error('Listener is not ready yet');
-        }
-        if (typeof address === 'string') {
-            throw new Error('Incorrect server address type');
-        }
-        if (this.listeningAddr == null) {
-            throw new Error('Listener is not ready yet');
-        }
-        // Because TCP will only return the IPv6 version
-        // we need to capture from the passed multiaddr
-        if (this.listeningAddr.toString().startsWith('/ip4')) {
-            addrs = addrs.concat(getMultiaddrs('ip4', address.address, address.port));
-        }
-        else if (address.family === 'IPv6') {
-            addrs = addrs.concat(getMultiaddrs('ip6', address.address, address.port));
-        }
-        return addrs.map(ma => this.peerId != null ? ma.encapsulate(`/p2p/${this.peerId}`) : ma);
-    }
-    async listen(ma) {
-        const peerId = ma.getPeerId();
-        if (peerId == null) {
-            ma = ma.decapsulateCode(CODE_P2P);
-        }
-        else {
-            this.peerId = peerId;
-        }
-        this.listeningAddr = ma;
-        return await new Promise((resolve, reject) => {
-            const options = multiaddrToNetConfig(ma);
-            this.server.listen(options, (err) => {
-                if (err != null) {
-                    return reject(err);
-                }
-                log('Listening on %s', this.server.address());
-                resolve();
+            await Promise.all([
+                server.__connections.map(async (maConn) => await attemptClose(maConn))
+            ]);
+            await new Promise((resolve, reject) => {
+                server.close(err => (err != null) ? reject(err) : resolve());
             });
-        });
-    }
-    async close() {
-        if (!this.server.listening) {
-            return;
         }
-        await Promise.all([
-            this.connections.map(async (maConn) => await attemptClose(maConn))
-        ]);
-        await new Promise((resolve, reject) => {
-            this.server.close(err => (err != null) ? reject(err) : resolve());
-        });
-    }
-    trackConn(maConn, socket) {
-        this.connections.push(maConn);
-        const untrackConn = () => {
-            this.connections = this.connections.filter(c => c !== maConn);
-        };
-        socket.once('close', untrackConn);
-    }
+    });
+    server
+        .on('listening', () => listener.dispatchEvent(new CustomEvent('listening')))
+        .on('error', err => listener.dispatchEvent(new CustomEvent('error', { detail: err })))
+        .on('close', () => listener.dispatchEvent(new CustomEvent('close')));
+    return listener;
 }
-/**
- * Create listener
- */
-export function createListener(context) {
-    const { handler, upgrader } = context;
-    return new TCPListener(upgrader, handler);
+function trackConn(server, maConn, socket) {
+    server.__connections.push(maConn);
+    const untrackConn = () => {
+        server.__connections = server.__connections.filter(c => c !== maConn);
+    };
+    socket.once('close', untrackConn);
 }
 //# sourceMappingURL=listener.js.map

package/dist/src/listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"listener.js","sourceRoot":"","sources":["../../src/listener.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AACrB,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EACL,aAAa,EACb,oBAAoB,EACrB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAM9D,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAA;AAEzC;;GAEG;AACH,KAAK,UAAU,YAAY,CAAE,MAA2B;IACtD,IAAI;QACF,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;KACrB;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,KAAK,CAAC,0CAA0C,EAAE,GAAG,CAAC,CAAA;KAC3D;AACH,CAAC;AAOD,MAAM,WAAY,SAAQ,YAA4B;IAMpD,YAAa,QAAkB,EAAE,OAA2B;QAC1D,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QAErB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;YACtC,uDAAuD;YACvD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;gBACvB,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YAEF,IAAI,MAA2B,CAAA;YAC/B,IAAI;gBACF,MAAM,GAAG,qBAAqB,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;aAC9E;YAAC,OAAO,GAAG,EAAE;gBACZ,GAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;gBAC3C,OAAM;aACP;YAED,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;YACnD,IAAI;gBACF,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;qBAC5B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACb,GAAG,CAAC,gCAAgC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;oBAExD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;oBAE9B,IAAI,OAAO,IAAI,IAAI,EAAE;wBACnB,OAAO,CAAC,IAAI,CAAC,CAAA;qBACd;oBAED,IAAI,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,YAAY,EAAE;wBAC/C,MAAM,EAAE,IAAI;qBACb,CAAC,CAAC,CAAA;gBACL,CAAC,CAAC;qBACD,KAAK,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;oBACjB,GAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;oBAE3C,MAAM,YAAY,CAAC,MAAM,CAAC,CAAA;gBAC5B,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,CAAC,EAAE;oBACX,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAA;gBACrD,CAAC,CAAC,CAAA;aACL;YAAC,OAAO,GAAG,EAAE;gBACZ,GAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAA;gBAE3C,YAAY,CAAC,MAAM,CAAC;qBACjB,KAAK,CAAC,GAAG,CAAC,EAAE;oBACX,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAA;gBACrD,CAAC,CAAC,CAAA;aACL;QACH,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;YAC5B,IAAI,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE;gBAC1C,MAAM,EAAE,GAAG;aACZ,CAAC,CAAC,CAAA;QACL,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;QAC9C,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;YAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,WAAW,CAAC,CAAC,CAAA;QAClD,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,QAAQ;QACN,IAAI,KAAK,GAAgB,EAAE,CAAA;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;QAErC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC7C;QAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACjD;QAED,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC7C;QAED,gDAAgD;QAChD,+CAA+C;QAC/C,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACpD,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;SAC1E;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YACpC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;SAC1E;QAED,OAAO,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC1F,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,EAAa;QACzB,MAAM,MAAM,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;QAE7B,IAAI,MAAM,IAAI,IAAI,EAAE;YAClB,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;SAClC;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;SACrB;QAED,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;QAEvB,OAAO,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,MAAM,OAAO,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAA;YACxC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAS,EAAE,EAAE;gBACxC,IAAI,GAAG,IAAI,IAAI,EAAE;oBACf,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;iBACnB;gBACD,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;gBAC7C,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YAC1B,OAAM;SACP;QAED,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;SACjE,CAAC,CAAA;QAEF,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;QACnE,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,SAAS,CAAE,MAA2B,EAAE,MAAkB;QACxD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE7B,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;QAC/D,CAAC,CAAA;QAED,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IACnC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAE,OAAgB;IAC9C,MAAM,EACJ,OAAO,EAAE,QAAQ,EAClB,GAAG,OAAO,CAAA;IAEX,OAAO,IAAI,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AAC3C,CAAC"}
+{"version":3,"file":"listener.js","sourceRoot":"","sources":["../../src/listener.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/tcp",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Node.js implementation of the TCP module that libp2p uses, which implements the interface-connection and interface-transport interfaces",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-tcp#readme",
@@ -147,9 +147,9 @@
     "@libp2p/interface-compliance-tests": "^1.1.2",
     "@libp2p/interfaces": "^1.3.2",
     "aegir": "^36.1.3",
+    "it-all": "^1.0.6",
     "it-pipe": "^2.0.3",
     "sinon": "^13.0.0",
-    "streaming-iterables": "^6.0.0",
     "uint8arrays": "^3.0.0"
   }
 }

package/src/index.ts

@@ -7,7 +7,7 @@ import { createListener } from './listener.js'
 import { multiaddrToNetConfig } from './utils.js'
 import { AbortError } from 'abortable-iterator'
 import { CODE_CIRCUIT, CODE_P2P } from './constants.js'
-import type { Transport, Upgrader, ListenerOptions, Listener } from '@libp2p/interfaces/transport'
+import type { Transport, Upgrader, ListenerOptions } from '@libp2p/interfaces/transport'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Socket } from 'net'
 
@@ -125,7 +125,7 @@ export class TCP implements Transport<DialOptions, ListenerOptions> {
    * anytime a new incoming Connection has been successfully upgraded via
    * `upgrader.upgradeInbound`.
    */
-  createListener (options: ListenerOptions = {}): Listener {
+  createListener (options: ListenerOptions = {}) {
     return createListener({ upgrader: this._upgrader, ...options })
   }
 

package/src/listener.ts

@@ -8,12 +8,16 @@ import {
 } from './utils.js'
 import { EventEmitter, CustomEvent } from '@libp2p/interfaces'
 import type { Connection } from '@libp2p/interfaces/connection'
-import type { MultiaddrConnection, Upgrader, Listener, ListenerEvents, ConnectionHandler } from '@libp2p/interfaces/transport'
+import type { MultiaddrConnection, Upgrader, Listener } from '@libp2p/interfaces/transport'
 import type { Server } from 'net'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
 const log = logger('libp2p:tcp:listener')
 
+interface ServerWithMultiaddrConnections extends Server {
+  __connections: MultiaddrConnection[]
+}
+
 /**
  * Attempts to close the given maConn. If a failure occurs, it will be logged
  */
@@ -30,159 +34,135 @@ interface Context {
   upgrader: Upgrader
 }
 
-class TCPListener extends EventEmitter<ListenerEvents> implements Listener {
-  private peerId?: string
-  private listeningAddr?: Multiaddr
-  private readonly server: Server
-  private connections: MultiaddrConnection[]
-
-  constructor (upgrader: Upgrader, handler?: ConnectionHandler) {
-    super()
-
-    this.connections = []
-
-    this.server = net.createServer(socket => {
-      // Avoid uncaught errors caused by unstable connections
-      socket.on('error', err => {
-        log('socket error', err)
-      })
+/**
+ * Create listener
+ */
+export function createListener (context: Context) {
+  const {
+    handler, upgrader
+  } = context
 
-      let maConn: MultiaddrConnection
-      try {
-        maConn = toMultiaddrConnection(socket, { listeningAddr: this.listeningAddr })
-      } catch (err) {
-        log.error('inbound connection failed', err)
-        return
-      }
+  let peerId: string | null
+  let listeningAddr: Multiaddr
 
-      log('new inbound connection %s', maConn.remoteAddr)
-      try {
-        upgrader.upgradeInbound(maConn)
-          .then((conn) => {
-            log('inbound connection %s upgraded', maConn.remoteAddr)
-
-            this.trackConn(maConn, socket)
-
-            if (handler != null) {
-              handler(conn)
-            }
-
-            this.dispatchEvent(new CustomEvent('connection', {
-              detail: conn
-            }))
-          })
-          .catch(async err => {
-            log.error('inbound connection failed', err)
-
-            await attemptClose(maConn)
-          })
-          .catch(err => {
-            log.error('closing inbound connection failed', err)
-          })
-      } catch (err) {
-        log.error('inbound connection failed', err)
-
-        attemptClose(maConn)
-          .catch(err => {
-            log.error('closing inbound connection failed', err)
-          })
-      }
-    })
-    this.server.on('error', err => {
-      this.dispatchEvent(new CustomEvent('error', {
-        detail: err
-      }))
+  const server: ServerWithMultiaddrConnections = Object.assign(net.createServer(socket => {
+    // Avoid uncaught errors caused by unstable connections
+    socket.on('error', err => {
+      log('socket error', err)
     })
-    this.server.on('close', () => {
-      this.dispatchEvent(new CustomEvent('close'))
-    })
-    this.server.on('listening', () => {
-      this.dispatchEvent(new CustomEvent('listening'))
-    })
-  }
 
-  getAddrs () {
-    let addrs: Multiaddr[] = []
-    const address = this.server.address()
-
-    if (address == null) {
-      throw new Error('Listener is not ready yet')
+    let maConn: MultiaddrConnection
+    try {
+      maConn = toMultiaddrConnection(socket, { listeningAddr })
+    } catch (err) {
+      log.error('inbound connection failed', err)
+      return
     }
 
-    if (typeof address === 'string') {
-      throw new Error('Incorrect server address type')
+    log('new inbound connection %s', maConn.remoteAddr)
+    try {
+      upgrader.upgradeInbound(maConn)
+        .then((conn) => {
+          log('inbound connection %s upgraded', maConn.remoteAddr)
+          trackConn(server, maConn, socket)
+
+          if (handler != null) {
+            handler(conn)
+          }
+
+          listener.dispatchEvent(new CustomEvent('connection', { detail: conn }))
+        })
+        .catch(async err => {
+          log.error('inbound connection failed', err)
+
+          await attemptClose(maConn)
+        })
+        .catch(err => {
+          log.error('closing inbound connection failed', err)
+        })
+    } catch (err) {
+      log.error('inbound connection failed', err)
+
+      attemptClose(maConn)
+        .catch(err => {
+          log.error('closing inbound connection failed', err)
+        })
     }
+  }),
+  // Keep track of open connections to destroy in case of timeout
+  { __connections: [] })
 
-    if (this.listeningAddr == null) {
-      throw new Error('Listener is not ready yet')
-    }
+  const listener: Listener = Object.assign(new EventEmitter(), {
+    getAddrs: () => {
+      let addrs: Multiaddr[] = []
+      const address = server.address()
 
-    // Because TCP will only return the IPv6 version
-    // we need to capture from the passed multiaddr
-    if (this.listeningAddr.toString().startsWith('/ip4')) {
-      addrs = addrs.concat(getMultiaddrs('ip4', address.address, address.port))
-    } else if (address.family === 'IPv6') {
-      addrs = addrs.concat(getMultiaddrs('ip6', address.address, address.port))
-    }
+      if (address == null) {
+        throw new Error('Listener is not ready yet')
+      }
 
-    return addrs.map(ma => this.peerId != null ? ma.encapsulate(`/p2p/${this.peerId}`) : ma)
-  }
+      if (typeof address === 'string') {
+        throw new Error('Incorrect server address type')
+      }
 
-  async listen (ma: Multiaddr) {
-    const peerId = ma.getPeerId()
+      // Because TCP will only return the IPv6 version
+      // we need to capture from the passed multiaddr
+      if (listeningAddr.toString().startsWith('/ip4')) {
+        addrs = addrs.concat(getMultiaddrs('ip4', address.address, address.port))
+      } else if (address.family === 'IPv6') {
+        addrs = addrs.concat(getMultiaddrs('ip6', address.address, address.port))
+      }
 
-    if (peerId == null) {
-      ma = ma.decapsulateCode(CODE_P2P)
-    } else {
-      this.peerId = peerId
-    }
+      return addrs.map(ma => peerId != null ? ma.encapsulate(`/p2p/${peerId}`) : ma)
+    },
+    listen: async (ma: Multiaddr) => {
+      listeningAddr = ma
+      peerId = ma.getPeerId()
 
-    this.listeningAddr = ma
+      if (peerId == null) {
+        listeningAddr = ma.decapsulateCode(CODE_P2P)
+      }
 
-    return await new Promise<void>((resolve, reject) => {
-      const options = multiaddrToNetConfig(ma)
-      this.server.listen(options, (err?: any) => {
-        if (err != null) {
-          return reject(err)
-        }
-        log('Listening on %s', this.server.address())
-        resolve()
+      return await new Promise<void>((resolve, reject) => {
+        const options = multiaddrToNetConfig(listeningAddr)
+        server.listen(options, (err?: any) => {
+          if (err != null) {
+            return reject(err)
+          }
+          log('Listening on %s', server.address())
+          resolve()
+        })
       })
-    })
-  }
+    },
+    close: async () => {
+      if (!server.listening) {
+        return
+      }
 
-  async close () {
-    if (!this.server.listening) {
-      return
+      await Promise.all([
+        server.__connections.map(async maConn => await attemptClose(maConn))
+      ])
+
+      await new Promise<void>((resolve, reject) => {
+        server.close(err => (err != null) ? reject(err) : resolve())
+      })
     }
+  })
 
-    await Promise.all([
-      this.connections.map(async maConn => await attemptClose(maConn))
-    ])
+  server
+    .on('listening', () => listener.dispatchEvent(new CustomEvent('listening')))
+    .on('error', err => listener.dispatchEvent(new CustomEvent('error', { detail: err })))
+    .on('close', () => listener.dispatchEvent(new CustomEvent('close')))
 
-    await new Promise<void>((resolve, reject) => {
-      this.server.close(err => (err != null) ? reject(err) : resolve())
-    })
-  }
-
-  trackConn (maConn: MultiaddrConnection, socket: net.Socket) {
-    this.connections.push(maConn)
+  return listener
+}
 
-    const untrackConn = () => {
-      this.connections = this.connections.filter(c => c !== maConn)
-    }
+function trackConn (server: ServerWithMultiaddrConnections, maConn: MultiaddrConnection, socket: net.Socket) {
+  server.__connections.push(maConn)
 
-    socket.once('close', untrackConn)
+  const untrackConn = () => {
+    server.__connections = server.__connections.filter(c => c !== maConn)
   }
-}
-
-/**
- * Create listener
- */
-export function createListener (context: Context) {
-  const {
-    handler, upgrader
-  } = context
 
-  return new TCPListener(upgrader, handler)
+  socket.once('close', untrackConn)
 }