chore: --

Signed-off-by: Sacha Froment <[email protected]>

packages/network/src/node.ts

@@ -37,7 +37,6 @@ import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
 
 import { Message } from "./proto/drp/network/v1/messages_pb.js";
 import { uint8ArrayToStream } from "./stream.js";
-import { waitForEvent } from "./utils/waiter.js";
 
 export * from "./stream.js";
 
@@ -242,32 +241,20 @@ export class DRPNetworkNode {
 		await this.start();
 	}
 
-	async isDialable(timeout = 5000) {
-		return waitForEvent(async (resolve, reject) => {
-			if (!this._node) {
-				resolve(false);
-				return;
-			}
+	async isDialable(callback: () => void | Promise<void>) {
+		if (await this._node?.isDialable(this._node.getMultiaddrs())) {
+			await callback();
+			return;
+		}
 
+		const checkDialable = async () => {
 			if (await this._node?.isDialable(this._node.getMultiaddrs())) {
-				resolve(true);
-				return;
+				this._node?.removeEventListener("transport:listening", checkDialable);
+				await callback();
 			}
+		};
 
-			const checkDialable = async () => {
-				try {
-					if (await this._node?.isDialable(this._node.getMultiaddrs())) {
-						resolve(true);
-					}
-				} catch (error) {
-					reject(error);
-				} finally {
-					this._node?.removeEventListener("transport:listening", checkDialable);
-				}
-			};
-
-			this._node.addEventListener("transport:listening", checkDialable);
-		}, timeout);
+		this._node?.addEventListener("transport:listening", checkDialable);
 	}
 
 	private _sortAddresses(a: Address, b: Address) {

packages/network/tests/index.test.ts

@@ -14,13 +14,33 @@ describe("isDialable", () => {
 		await btNode.start();
 	});
 
+	const isDialable = async (node: DRPNetworkNode, timeout = false) => {
+		let resolver: (value: boolean) => void;
+		const promise = new Promise<boolean>((resolve) => {
+			resolver = resolve;
+		});
+
+		if (timeout) {
+			setTimeout(() => {
+				resolver(false);
+			}, 10);
+		}
+
+		const callback = () => {
+			resolver(true);
+		};
+
+		await node.isDialable(callback);
+		return await promise;
+	};
+
 	test("should return true if the node is dialable", async () => {
 		const node = new DRPNetworkNode({
 			bootstrap_peers: btNode.getMultiaddrs()?.map((addr) => addr.toString()) || [],
 			private_key_seed: "is_dialable_node_1",
 		});
 		await node.start();
-		expect(await node.isDialable(100)).toBe(true);
+		expect(await isDialable(node)).toBe(true);
 	});
 
 	test("should return false if the node is not dialable", async () => {
@@ -30,6 +50,6 @@ describe("isDialable", () => {
 			listen_addresses: [],
 		});
 		await node.start();
-		expect(await node.isDialable(100)).toBe(false);
+		expect(await isDialable(node, true)).toBe(false);
 	});
 });