@peerbit/libp2p-test-utils 2.1.21 → 2.2.0-000e3f1

package/src/session.ts

@@ -1,11 +1,12 @@
 import { noise } from "@chainsafe/libp2p-noise";
 import { yamux } from "@chainsafe/libp2p-yamux";
-import { type CircuitRelayService } from "@libp2p/circuit-relay-v2";
+import type { CircuitRelayService } from "@libp2p/circuit-relay-v2";
 import { identify } from "@libp2p/identify";
 import type { Multiaddr } from "@multiformats/multiaddr";
 import { waitFor } from "@peerbit/time";
 import { setMaxListeners } from "events";
-import { type Libp2p, type Libp2pOptions, createLibp2p } from "libp2p";
+import { createLibp2p } from "libp2p";
+import type { Libp2p, Libp2pOptions } from "libp2p";
 import { listen, relay, transports } from "./transports.js";
 
 type DefaultServices = { relay: CircuitRelayService; identify: any };
@@ -20,10 +21,10 @@ export class TestSession<T> {
 
 	async connect(
 		groups?: {
-			getMultiaddrs: () => Multiaddr[];
-			dial: (addres: Multiaddr[]) => Promise<any>;
+			getMultiaddrs(): Multiaddr[];
+			dial(addres: Multiaddr[]): Promise<any>;
 		}[][],
-	) {
+	): Promise<TestSession<T>> {
 		// Connect the nodes
 		const connectPromises: Promise<any>[] = [];
 		if (!groups) {
@@ -49,10 +50,10 @@ export class TestSession<T> {
 
 	async connectLine(
 		groups?: {
-			getMultiaddrs: () => Multiaddr[];
-			dial: (addres: Multiaddr[]) => Promise<any>;
+			getMultiaddrs(): Multiaddr[];
+			dial(addres: Multiaddr[]): Promise<any>;
 		}[][],
-	) {
+	): Promise<TestSession<T>> {
 		const connectPromises: Promise<any>[] = [];
 		if (!groups) {
 			groups = [this.peers];
@@ -76,7 +77,7 @@ export class TestSession<T> {
 	static async connected<T extends Record<string, unknown>>(
 		n: number,
 		options?: Libp2pOptions<T> | Libp2pOptions<T>[],
-	) {
+	): Promise<TestSession<T>> {
 		const libs = (await TestSession.disconnected<T>(n, options)).peers;
 		return new TestSession<T>(libs).connect();
 	}
@@ -84,16 +85,16 @@ export class TestSession<T> {
 	static async disconnected<T extends Record<string, unknown>>(
 		n: number,
 		options?: Libp2pOptions<T> | Libp2pOptions<T>[],
-	) {
+	): Promise<TestSession<T>> {
 		// Allow more than 11 listneers
 		setMaxListeners(Infinity);
 
 		// create nodes
-		const promises: Promise<Libp2p<T>>[] = [];
+		const promises: Promise<Libp2pWithServices<T>>[] = [];
 		for (let i = 0; i < n; i++) {
-			const result = async () => {
-				const definedOptions: Libp2pOptions<T> | undefined =
-					(options as any)?.[i] || options;
+			const result = async (): Promise<Libp2pWithServices<T>> => {
+				const definedOptions: Libp2pOptions<T & DefaultServices> | undefined =
+					(options as any)?.[i] || (options as any);
 
 				const services: any = {
 					identify: identify(),
@@ -105,9 +106,10 @@ export class TestSession<T> {
 					delete services.relay;
 				}
 
-				const node = await createLibp2p<T>({
+				const node = await createLibp2p<T & DefaultServices>({
 					addresses: {
-						listen: listen(),
+						...(definedOptions?.addresses ?? {}),
+						listen: definedOptions?.addresses?.listen ?? listen(),
 					},
 					connectionManager: definedOptions?.connectionManager,
 					privateKey: definedOptions?.privateKey,

package/src/transports.ts

@@ -3,11 +3,11 @@ import {
 	circuitRelayTransport,
 } from "@libp2p/circuit-relay-v2";
 import type { Transport } from "@libp2p/interface";
+import { tcp } from "@libp2p/tcp";
 import { webRTC } from "@libp2p/webrtc";
 import { webSockets } from "@libp2p/websockets";
 
 export const transports = (): Array<(components: any) => Transport> => [
-	// todo: add types
 	circuitRelayTransport({
 		reservationCompletionTimeout: 5000,
 	}),
@@ -15,12 +15,18 @@ export const transports = (): Array<(components: any) => Transport> => [
 	webSockets(),
 ];
 
+export const transportsFast = (): Array<(components: any) => Transport> => [
+	tcp(),
+];
+
 // applyDefaultLimit: false because of https://github.com/libp2p/js-libp2p/issues/2622
-export const relay = () =>
+export const relay = (): ReturnType<typeof circuitRelayServer> =>
 	circuitRelayServer({ reservations: { applyDefaultLimit: false } });
 
-export const listen = () => [
+export const listen = (): string[] => [
 	"/ip4/127.0.0.1/tcp/0",
 	"/ip4/127.0.0.1/tcp/0/ws",
 	"/p2p-circuit",
 ];
+
+export const listenFast = (): string[] => ["/ip4/127.0.0.1/tcp/0"];