@libp2p/interface-compliance-tests 1.1.0 → 1.1.4

package/dist/src/{utils/mock-connection-gater.d.ts → mocks/connection-gater.d.ts}

@@ -9,4 +9,4 @@ export declare function mockConnectionGater(): {
     denyOutboundUpgradedConnection: () => Promise<boolean>;
     filterMultiaddrForPeer: () => Promise<boolean>;
 };
-//# sourceMappingURL=mock-connection-gater.d.ts.map
+//# sourceMappingURL=connection-gater.d.ts.map

package/dist/src/mocks/connection-gater.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-gater.d.ts","sourceRoot":"","sources":["../../../src/mocks/connection-gater.ts"],"names":[],"mappings":"AACA,wBAAgB,mBAAmB;;;;;;;;;;EAYlC"}

package/dist/src/{utils/mock-connection-gater.js → mocks/connection-gater.js}

@@ -11,4 +11,4 @@ export function mockConnectionGater() {
         filterMultiaddrForPeer: async () => await Promise.resolve(true)
     };
 }
-//# sourceMappingURL=mock-connection-gater.js.map
+//# sourceMappingURL=connection-gater.js.map

package/dist/src/mocks/connection-gater.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-gater.js","sourceRoot":"","sources":["../../../src/mocks/connection-gater.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QACtD,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QAC3D,qBAAqB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/D,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QAChE,8BAA8B,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QACxE,+BAA+B,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,6BAA6B,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QACvE,8BAA8B,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QACxE,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;KAChE,CAAA;AACH,CAAC"}

package/dist/src/mocks/connection-manager.d.ts

@@ -0,0 +1,18 @@
+import { EventEmitter } from '@libp2p/interfaces';
+import type { Connection } from '@libp2p/interfaces/src/connection';
+import type { PeerId } from '@libp2p/interfaces/src/peer-id';
+import type { ConnectionManager, ConnectionManagerEvents } from '@libp2p/interfaces/src/registrar';
+declare class MockConnectionManager extends EventEmitter<ConnectionManagerEvents> implements ConnectionManager {
+    getConnection(peerId: PeerId): Connection | undefined;
+    listenerCount(type: string): number;
+    addEventListener<U extends 'peer:connect'>(type: U, callback: ((evt: ConnectionManagerEvents[U]) => void) | {
+        handleEvent: (evt: ConnectionManagerEvents[U]) => void;
+    } | null, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<U extends 'peer:connect'>(type: U, callback: (((evt: ConnectionManagerEvents[U]) => void) | {
+        handleEvent: (evt: ConnectionManagerEvents[U]) => void;
+    } | null) | undefined, options?: boolean | EventListenerOptions): void;
+    dispatchEvent(event: Event): boolean;
+}
+export declare function mockConnectionManager(): MockConnectionManager;
+export {};
+//# sourceMappingURL=connection-manager.d.ts.map

package/dist/src/mocks/connection-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../../src/mocks/connection-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAElG,cAAM,qBAAsB,SAAQ,YAAY,CAAC,uBAAuB,CAAE,YAAW,iBAAiB;IACpG,aAAa,CAAE,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAItD,aAAa,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAIpC,gBAAgB,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG;QAAE,WAAW,EAAE,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;KAAE,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB,GAAG,IAAI;IAIjO,mBAAmB,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG;QAAE,WAAW,EAAE,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,oBAAoB,GAAG,IAAI;IAI/O,aAAa,CAAE,KAAK,EAAE,KAAK,GAAG,OAAO;CAGtC;AAED,wBAAgB,qBAAqB,0BAEpC"}

package/dist/src/mocks/connection-manager.js

@@ -0,0 +1,22 @@
+import { EventEmitter } from '@libp2p/interfaces';
+class MockConnectionManager extends EventEmitter {
+    getConnection(peerId) {
+        throw new Error('Method not implemented.');
+    }
+    listenerCount(type) {
+        throw new Error('Method not implemented.');
+    }
+    addEventListener(type, callback, options) {
+        throw new Error('Method not implemented.');
+    }
+    removeEventListener(type, callback, options) {
+        throw new Error('Method not implemented.');
+    }
+    dispatchEvent(event) {
+        throw new Error('Method not implemented.');
+    }
+}
+export function mockConnectionManager() {
+    return new MockConnectionManager();
+}
+//# sourceMappingURL=connection-manager.js.map

package/dist/src/mocks/connection-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../../src/mocks/connection-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAKjD,MAAM,qBAAsB,SAAQ,YAAqC;IACvE,aAAa,CAAE,MAAc;QAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,aAAa,CAAE,IAAY;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,gBAAgB,CAA2B,IAAO,EAAE,QAAyH,EAAE,OAA2C;QACxN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,mBAAmB,CAA2B,IAAO,EAAE,QAAuI,EAAE,OAAwC;QACtO,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,aAAa,CAAE,KAAY;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CACF;AAED,MAAM,UAAU,qBAAqB;IACnC,OAAO,IAAI,qBAAqB,EAAE,CAAA;AACpC,CAAC"}

package/dist/src/mocks/connection.d.ts

@@ -0,0 +1,8 @@
+import type { MultiaddrConnection } from '@libp2p/interfaces/transport';
+import type { Connection, Stream } from '@libp2p/interfaces/connection';
+import type { Muxer } from '@libp2p/interfaces/stream-muxer';
+import type { Duplex } from 'it-stream-types';
+export declare function mockConnection(maConn: MultiaddrConnection, direction?: 'inbound' | 'outbound', muxer?: Muxer): Promise<Connection>;
+export declare function mockStream(stream: Duplex<Uint8Array>): Stream;
+export declare function connectionPair(): [Connection, Connection];
+//# sourceMappingURL=connection.d.ts.map

package/dist/src/mocks/connection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/mocks/connection.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAA4B,MAAM,+BAA+B,CAAA;AACjG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAG7C,wBAAsB,cAAc,CAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,GAAE,SAAS,GAAG,UAAsB,EAAE,KAAK,GAAE,KAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CAwDjK;AAED,wBAAgB,UAAU,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAW9D;AAED,wBAAgB,cAAc,IAAK,CAAE,UAAU,EAAE,UAAU,CAAE,CAmB5D"}

package/dist/src/{utils/mock-connection.js → mocks/connection.js}

@@ -1,13 +1,15 @@
 import { PeerId } from '@libp2p/peer-id';
 import { createEd25519PeerId } from '@libp2p/peer-id-factory';
 import { pipe } from 'it-pipe';
-export async function mockConnection(maConn, direction, muxer) {
+import { duplexPair } from 'it-pair/duplex';
+import { mockMuxer } from './muxer.js';
+export async function mockConnection(maConn, direction = 'inbound', muxer = mockMuxer()) {
     const remoteAddr = maConn.remoteAddr;
     const remotePeerIdStr = remoteAddr.getPeerId();
     const remotePeer = remotePeerIdStr != null ? PeerId.fromString(remotePeerIdStr) : await createEd25519PeerId();
+    const registry = new Map();
     const streams = [];
     let streamId = 0;
-    const registry = new Map();
     void pipe(maConn, muxer, maConn);
     return {
         id: 'mock-connection',
@@ -49,4 +51,35 @@ export async function mockConnection(maConn, direction, muxer) {
         }
     };
 }
-//# sourceMappingURL=mock-connection.js.map
+export function mockStream(stream) {
+    return {
+        ...stream,
+        close: () => { },
+        abort: () => { },
+        reset: () => { },
+        timeline: {
+            open: Date.now()
+        },
+        id: `stream-${Date.now()}`
+    };
+}
+export function connectionPair() {
+    const [d0, d1] = duplexPair();
+    return [
+        // @ts-expect-error not a complete implementation
+        {
+            newStream: async (multicodecs) => await Promise.resolve({
+                stream: mockStream(d0),
+                protocol: multicodecs[0]
+            })
+        },
+        // @ts-expect-error not a complete implementation
+        {
+            newStream: async (multicodecs) => await Promise.resolve({
+                stream: mockStream(d1),
+                protocol: multicodecs[0]
+            })
+        }
+    ];
+}
+//# sourceMappingURL=connection.js.map

package/dist/src/mocks/connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/mocks/connection.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,9 @@
+export { mockConnectionGater } from './connection-gater.js';
+export { mockConnectionManager } from './connection-manager.js';
+export { mockConnection, mockStream, connectionPair } from './connection.js';
+export { mockMultiaddrConnection } from './multiaddr-connection.js';
+export { mockMuxer } from './muxer.js';
+export { mockRegistrar } from './registrar.js';
+export { mockUpgrader } from './upgrader.js';
+export type { MockUpgraderOptions } from './upgrader.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mocks/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,YAAY,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA"}

package/dist/src/mocks/index.js

@@ -0,0 +1,8 @@
+export { mockConnectionGater } from './connection-gater.js';
+export { mockConnectionManager } from './connection-manager.js';
+export { mockConnection, mockStream, connectionPair } from './connection.js';
+export { mockMultiaddrConnection } from './multiaddr-connection.js';
+export { mockMuxer } from './muxer.js';
+export { mockRegistrar } from './registrar.js';
+export { mockUpgrader } from './upgrader.js';
+//# sourceMappingURL=index.js.map

package/dist/src/mocks/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/mocks/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA"}

package/dist/src/{utils/mock-multiaddr-connection.d.ts → mocks/multiaddr-connection.d.ts}

@@ -1,4 +1,4 @@
 import type { MultiaddrConnection } from '@libp2p/interfaces/transport';
 import type { Duplex } from 'it-stream-types';
-export declare function mockMultiaddrConnection(source: Duplex<Uint8Array>): MultiaddrConnection;
-//# sourceMappingURL=mock-multiaddr-connection.d.ts.map
+export declare function mockMultiaddrConnection(source: Duplex<Uint8Array> & Partial<MultiaddrConnection>): MultiaddrConnection;
+//# sourceMappingURL=multiaddr-connection.d.ts.map

package/dist/src/mocks/multiaddr-connection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"multiaddr-connection.d.ts","sourceRoot":"","sources":["../../../src/mocks/multiaddr-connection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAE7C,wBAAgB,uBAAuB,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAavH"}

package/dist/src/{utils/mock-multiaddr-connection.js → mocks/multiaddr-connection.js}

@@ -1,14 +1,14 @@
 import { Multiaddr } from '@multiformats/multiaddr';
 export function mockMultiaddrConnection(source) {
     const maConn = {
-        ...source,
         async close() {
         },
         timeline: {
             open: Date.now()
         },
-        remoteAddr: new Multiaddr('/ip4/127.0.0.1/tcp/4001')
+        remoteAddr: new Multiaddr('/ip4/127.0.0.1/tcp/4001'),
+        ...source
     };
     return maConn;
 }
-//# sourceMappingURL=mock-multiaddr-connection.js.map
+//# sourceMappingURL=multiaddr-connection.js.map

package/dist/src/mocks/multiaddr-connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multiaddr-connection.js","sourceRoot":"","sources":["../../../src/mocks/multiaddr-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAInD,MAAM,UAAU,uBAAuB,CAAE,MAAyD;IAChG,MAAM,MAAM,GAAwB;QAClC,KAAK,CAAC,KAAK;QAEX,CAAC;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;SACjB;QACD,UAAU,EAAE,IAAI,SAAS,CAAC,yBAAyB,CAAC;QACpD,GAAG,MAAM;KACV,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/dist/src/{utils/mock-muxer.d.ts → mocks/muxer.d.ts}

@@ -1,3 +1,3 @@
 import type { Muxer } from '@libp2p/interfaces/stream-muxer';
 export declare function mockMuxer(): Muxer;
-//# sourceMappingURL=mock-muxer.d.ts.map
+//# sourceMappingURL=muxer.d.ts.map

package/dist/src/mocks/muxer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"muxer.d.ts","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAE5D,wBAAgB,SAAS,IAAK,KAAK,CAoClC"}

package/dist/src/{utils/mock-muxer.js → mocks/muxer.js}

@@ -34,4 +34,4 @@ export function mockMuxer() {
     };
     return muxer;
 }
-//# sourceMappingURL=mock-muxer.js.map
+//# sourceMappingURL=muxer.js.map

package/dist/src/mocks/muxer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"muxer.js","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,MAAM,UAAU,CAAA;AAI5B,MAAM,UAAU,SAAS;IACvB,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,MAAM,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEhC,MAAM,KAAK,GAAU;QACnB,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACrB,MAAM,KAAK,CAAC,MAAM,CAAC,CAAA;QACrB,CAAC;QACD,IAAI,OAAO;YACT,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,SAAS,EAAE,CAAC,IAAa,EAAE,EAAE;YAC3B,MAAM,IAAI,GAAG,IAAI,EAAc,CAAA;YAE/B,MAAM,EAAE,GAAG,GAAG,QAAQ,EAAE,EAAE,CAAA;YAC1B,MAAM,MAAM,GAAW;gBACrB,EAAE;gBACF,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,GAAG,EAAE;oBACV,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;gBAC7C,CAAC;gBACD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;gBACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;gBACf,QAAQ,EAAE;oBACR,IAAI,EAAE,CAAC;iBACR;aACF,CAAA;YAED,OAAO,MAAM,CAAA;QACf,CAAC;KACF,CAAA;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/src/mocks/registrar.d.ts

@@ -0,0 +1,14 @@
+import type { Registrar, StreamHandler } from '@libp2p/interfaces/registrar';
+import type { Topology } from '@libp2p/interfaces/topology';
+export declare class MockRegistrar implements Registrar {
+    private readonly topologies;
+    private readonly handlers;
+    handle(protocols: string | string[], handler: StreamHandler): Promise<string>;
+    unhandle(id: string): Promise<void>;
+    getHandlers(protocol: string): StreamHandler[];
+    register(protocols: string | string[], topology: Topology): string;
+    unregister(id: string | string[]): void;
+    getTopologies(protocol: string): Topology[];
+}
+export declare function mockRegistrar(): MockRegistrar;
+//# sourceMappingURL=registrar.d.ts.map

package/dist/src/mocks/registrar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registrar.d.ts","sourceRoot":"","sources":["../../../src/mocks/registrar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAE3D,qBAAa,aAAc,YAAW,SAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsE;IACjG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0E;IAE7F,MAAM,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa;IAe5D,QAAQ,CAAE,EAAE,EAAE,MAAM;IAI1B,WAAW,CAAE,QAAQ,EAAE,MAAM;IAY7B,QAAQ,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ;IAe1D,UAAU,CAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAQjC,aAAa,CAAE,QAAQ,EAAE,MAAM;CAKhC;AAED,wBAAgB,aAAa,kBAE5B"}

package/dist/src/mocks/registrar.js

@@ -0,0 +1,54 @@
+export class MockRegistrar {
+    constructor() {
+        this.topologies = new Map();
+        this.handlers = new Map();
+    }
+    async handle(protocols, handler) {
+        if (!Array.isArray(protocols)) {
+            protocols = [protocols];
+        }
+        const id = `handler-id-${Math.random()}`;
+        this.handlers.set(id, {
+            handler,
+            protocols
+        });
+        return id;
+    }
+    async unhandle(id) {
+        this.handlers.delete(id);
+    }
+    getHandlers(protocol) {
+        const output = [];
+        for (const { handler, protocols } of this.handlers.values()) {
+            if (protocols.includes(protocol)) {
+                output.push(handler);
+            }
+        }
+        return output;
+    }
+    register(protocols, topology) {
+        if (!Array.isArray(protocols)) {
+            protocols = [protocols];
+        }
+        const id = `topology-id-${Math.random()}`;
+        this.topologies.set(id, {
+            topology,
+            protocols
+        });
+        return id;
+    }
+    unregister(id) {
+        if (!Array.isArray(id)) {
+            id = [id];
+        }
+        id.forEach(id => this.topologies.delete(id));
+    }
+    getTopologies(protocol) {
+        const output = [];
+        return output;
+    }
+}
+export function mockRegistrar() {
+    return new MockRegistrar();
+}
+//# sourceMappingURL=registrar.js.map

package/dist/src/mocks/registrar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registrar.js","sourceRoot":"","sources":["../../../src/mocks/registrar.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,aAAa;IAA1B;QACmB,eAAU,GAA6D,IAAI,GAAG,EAAE,CAAA;QAChF,aAAQ,GAAiE,IAAI,GAAG,EAAE,CAAA;IA6DrG,CAAC;IA3DC,KAAK,CAAC,MAAM,CAAE,SAA4B,EAAE,OAAsB;QAChE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC7B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAA;SACxB;QAED,MAAM,EAAE,GAAG,cAAc,IAAI,CAAC,MAAM,EAAE,EAAE,CAAA;QAExC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE;YACpB,OAAO;YACP,SAAS;SACV,CAAC,CAAA;QAEF,OAAO,EAAE,CAAA;IACX,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,EAAU;QACxB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,WAAW,CAAE,QAAgB;QAC3B,MAAM,MAAM,GAAoB,EAAE,CAAA;QAElC,KAAK,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;YAC3D,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAChC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aACrB;SACF;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,QAAQ,CAAE,SAA4B,EAAE,QAAkB;QACxD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC7B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAA;SACxB;QAED,MAAM,EAAE,GAAG,eAAe,IAAI,CAAC,MAAM,EAAE,EAAE,CAAA;QAEzC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE;YACtB,QAAQ;YACR,SAAS;SACV,CAAC,CAAA;QAEF,OAAO,EAAE,CAAA;IACX,CAAC;IAED,UAAU,CAAE,EAAqB;QAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACtB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;SACV;QAED,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9C,CAAC;IAED,aAAa,CAAE,QAAgB;QAC7B,MAAM,MAAM,GAAe,EAAE,CAAA;QAE7B,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,aAAa,EAAE,CAAA;AAC5B,CAAC"}

package/dist/src/{utils/mock-upgrader.d.ts → mocks/upgrader.d.ts}

@@ -4,4 +4,4 @@ export interface MockUpgraderOptions {
     muxer?: Muxer;
 }
 export declare function mockUpgrader(options?: MockUpgraderOptions): Upgrader;
-//# sourceMappingURL=mock-upgrader.d.ts.map
+//# sourceMappingURL=upgrader.d.ts.map

package/dist/src/mocks/upgrader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrader.d.ts","sourceRoot":"","sources":["../../../src/mocks/upgrader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,8BAA8B,CAAA;AACjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAE5D,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,wBAAgB,YAAY,CAAE,OAAO,GAAE,mBAAwB,YAsB9D"}

package/dist/src/{utils/mock-upgrader.js → mocks/upgrader.js}

@@ -1,6 +1,6 @@
 import { expect } from 'aegir/utils/chai.js';
-import { mockMuxer } from './mock-muxer.js';
-import { mockConnection } from './mock-connection.js';
+import { mockMuxer } from './muxer.js';
+import { mockConnection } from './connection.js';
 export function mockUpgrader(options = {}) {
     const ensureProps = (multiaddrConnection) => {
         ['sink', 'source', 'remoteAddr', 'timeline', 'close'].forEach(prop => {
@@ -21,4 +21,4 @@ export function mockUpgrader(options = {}) {
     };
     return upgrader;
 }
-//# sourceMappingURL=mock-upgrader.js.map
+//# sourceMappingURL=upgrader.js.map

package/dist/src/mocks/upgrader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../../src/mocks/upgrader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAQhD,MAAM,UAAU,YAAY,CAAE,UAA+B,EAAE;IAC7D,MAAM,WAAW,GAAG,CAAC,mBAAwC,EAAE,EAAE;QAC/D,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnE,MAAM,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,OAAO,mBAAmB,CAAA;IAC5B,CAAC,CAAA;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,EAAE,CAAA;IAE1C,MAAM,QAAQ,GAAa;QACzB,KAAK,CAAC,eAAe,CAAE,mBAAmB;YACxC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,MAAM,cAAc,CAAC,mBAAmB,EAAE,UAAU,EAAE,KAAK,CAAC,CAAA;QACrE,CAAC;QACD,KAAK,CAAC,cAAc,CAAE,mBAAmB;YACvC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,MAAM,cAAc,CAAC,mBAAmB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpE,CAAC;KACF,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC"}

package/dist/src/peer-discovery/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/peer-discovery/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;iCAE3B,UAAU,aAAa,GAAG,SAAS,CAAC;AAA5D,wBA8EC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/peer-discovery/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;iCAE3B,UAAU,aAAa,GAAG,SAAS,CAAC;AAA5D,wBA4EC"}

package/dist/src/peer-discovery/index.js

@@ -10,7 +10,6 @@ export default (common) => {
         });
         afterEach('ensure discovery was stopped', async () => {
             await discovery.stop();
-            discovery.removeAllListeners();
             await common.teardown();
         });
         it('can start the service', async () => {
@@ -30,7 +29,8 @@ export default (common) => {
         it('should emit a peer event after start', async () => {
             const defer = pDefer();
             await discovery.start();
-            discovery.on('peer', ({ id, multiaddrs }) => {
+            discovery.addEventListener('peer', (evt) => {
+                const { id, multiaddrs } = evt.detail;
                 expect(id).to.exist();
                 expect(id).to.have.property('type').that.is.oneOf(['RSA', 'Ed25519', 'secp256k1']);
                 expect(multiaddrs).to.exist();
@@ -40,7 +40,7 @@ export default (common) => {
             await defer.promise;
         });
         it('should not receive a peer event before start', async () => {
-            discovery.on('peer', () => {
+            discovery.addEventListener('peer', () => {
                 throw new Error('should not receive a peer event before start');
             });
             await delay(2000);
@@ -48,12 +48,12 @@ export default (common) => {
         it('should not receive a peer event after stop', async () => {
             const deferStart = pDefer();
             await discovery.start();
-            discovery.on('peer', () => {
+            discovery.addEventListener('peer', () => {
                 deferStart.resolve();
             });
             await deferStart.promise;
             await discovery.stop();
-            discovery.on('peer', () => {
+            discovery.addEventListener('peer', () => {
                 throw new Error('should not receive a peer event after stop');
             });
             await delay(2000);

package/dist/src/peer-discovery/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/peer-discovery/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/peer-discovery/index.ts"],"names":[],"mappings":"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"}

package/dist/src/pubsub/api.d.ts

@@ -1,6 +1,6 @@
 import type { TestSetup } from '../index.js';
 import type { PubSub } from '@libp2p/interfaces/pubsub';
-import type { Startable } from '@libp2p/interfaces';
-declare const _default: (common: TestSetup<PubSub & Startable>) => void;
+import type { EventMap } from './index.js';
+declare const _default: (common: TestSetup<PubSub<EventMap>>) => void;
 export default _default;
 //# sourceMappingURL=api.d.ts.map

package/dist/src/pubsub/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/pubsub/api.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;iCAK3B,UAAU,MAAM,GAAG,SAAS,CAAC;AAArD,wBA4EC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/pubsub/api.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;iCAKlB,UAAU,OAAO,QAAQ,CAAC,CAAC;AAAnD,wBA2EC"}

package/dist/src/pubsub/api.js

@@ -36,7 +36,7 @@ export default (common) => {
             };
             await pubsub.start();
             pubsub.subscribe(topic);
-            pubsub.on('topic', handler);
+            pubsub.addEventListener('topic', handler);
             await pWaitFor(() => {
                 const topics = pubsub.getTopics();
                 return topics.length === 1 && topics[0] === topic;
@@ -49,13 +49,13 @@ export default (common) => {
         });
         it('can subscribe and publish correctly', async () => {
             const defer = pDefer();
-            const handler = (msg) => {
-                expect(msg).to.not.eql(undefined);
-                defer.resolve();
-            };
             await pubsub.start();
             pubsub.subscribe(topic);
-            pubsub.on(topic, handler);
+            pubsub.addEventListener(topic, (evt) => {
+                const msg = evt.detail;
+                expect(msg).to.not.eql(undefined);
+                defer.resolve();
+            });
             await pubsub.publish(topic, data);
             await defer.promise;
             await pubsub.stop();

package/dist/src/pubsub/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/pubsub/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/pubsub/api.ts"],"names":[],"mappings":"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"}

package/dist/src/pubsub/connection-handlers.d.ts

@@ -1,6 +1,6 @@
 import type { TestSetup } from '../index.js';
 import type { PubSub } from '@libp2p/interfaces/pubsub';
-import type { Startable } from '@libp2p/interfaces';
-declare const _default: (common: TestSetup<PubSub & Startable>) => void;
+import type { EventMap } from './index.js';
+declare const _default: (common: TestSetup<PubSub<EventMap>>) => void;
 export default _default;
 //# sourceMappingURL=connection-handlers.d.ts.map

package/dist/src/pubsub/connection-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-handlers.d.ts","sourceRoot":"","sources":["../../../src/pubsub/connection-handlers.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;iCAE3B,UAAU,MAAM,GAAG,SAAS,CAAC;AAArD,wBAwVC"}
+{"version":3,"file":"connection-handlers.d.ts","sourceRoot":"","sources":["../../../src/pubsub/connection-handlers.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;iCAElB,UAAU,OAAO,QAAQ,CAAC,CAAC;AAAnD,wBAiWC"}

package/dist/src/pubsub/connection-handlers.js

@@ -37,8 +37,12 @@ export default (common) => {
                 await Promise.all([
                     // @ts-expect-error protected fields
                     psA._libp2p.dial(psB.peerId),
-                    new Promise((resolve) => psA.once('pubsub:subscription-change', resolve)),
-                    new Promise((resolve) => psB.once('pubsub:subscription-change', resolve))
+                    new Promise((resolve) => psA.addEventListener('pubsub:subscription-change', resolve, {
+                        once: true
+                    })),
+                    new Promise((resolve) => psB.addEventListener('pubsub:subscription-change', resolve, {
+                        once: true
+                    }))
                 ]);
                 expect(psA.peers.size).to.equal(1);
                 expect(psB.peers.size).to.equal(1);
@@ -77,7 +81,8 @@ export default (common) => {
                 await psA._libp2p.dial(psB.peerId);
                 let subscribedTopics = psA.getTopics();
                 expect(subscribedTopics).to.not.include(topic);
-                psA.on(topic, (msg) => {
+                psA.addEventListener(topic, (evt) => {
+                    const msg = evt.detail;
                     expect(msg.data).to.equalBytes(data);
                     defer.resolve();
                 });
@@ -132,7 +137,8 @@ export default (common) => {
                 ]);
                 let subscribedTopics = psA.getTopics();
                 expect(subscribedTopics).to.not.include(topic);
-                psA.on(topic, (msg) => {
+                psA.addEventListener(topic, (evt) => {
+                    const msg = evt.detail;
                     expect(msg.data).to.equalBytes(data);
                     defer.resolve();
                 });
@@ -173,7 +179,8 @@ export default (common) => {
                 await psA._libp2p.dial(psB.peerId);
                 let subscribedTopics = psA.getTopics();
                 expect(subscribedTopics).to.not.include(topic);
-                psA.on(topic, (msg) => {
+                psA.addEventListener(topic, (evt) => {
+                    const msg = evt.detail;
                     expect(msg.data).to.equalBytes(data);
                     counter++;
                     counter === 1 ? defer1.resolve() : defer2.resolve();
@@ -219,7 +226,8 @@ export default (common) => {
                 let aReceivedSecondMessageFromB = false;
                 let bReceivedFirstMessageFromA = false;
                 let bReceivedSecondMessageFromA = false;
-                const handlerSpyA = (message) => {
+                const handlerSpyA = (evt) => {
+                    const message = evt.detail;
                     const data = uint8ArrayToString(message.data);
                     if (data === 'message-from-b-1') {
                         aReceivedFirstMessageFromB = true;
@@ -228,7 +236,8 @@ export default (common) => {
                         aReceivedSecondMessageFromB = true;
                     }
                 };
-                const handlerSpyB = (message) => {
+                const handlerSpyB = (evt) => {
+                    const message = evt.detail;
                     const data = uint8ArrayToString(message.data);
                     if (data === 'message-from-a-1') {
                         bReceivedFirstMessageFromA = true;
@@ -238,8 +247,8 @@ export default (common) => {
                     }
                 };
                 const topic = 'reconnect-channel';
-                psA.on(topic, handlerSpyA);
-                psB.on(topic, handlerSpyB);
+                psA.addEventListener(topic, handlerSpyA);
+                psB.addEventListener(topic, handlerSpyB);
                 psA.subscribe(topic);
                 psB.subscribe(topic);
                 // Create two connections to the remote peer