From bb36a80913bf61992a61826c2984619daf4e2185 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Sat, 25 Mar 2023 10:51:07 -0400
Subject: [PATCH] *Switch to using maybeGetAsyncProperty

---
 src/network.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/network.ts b/src/network.ts
index d03ff2c..dab9747 100644
--- a/src/network.ts
+++ b/src/network.ts
@@ -2,7 +2,7 @@
 import Hyperswarm from "hyperswarm";
 import RpcNetworkQueryFactory from "./query/index.js";
 import b4a from "b4a";
-import { createHash, isPromise } from "./util.js";
+import { createHash, maybeGetAsyncProperty } from "./util.js";
 
 export default class RpcNetwork {
   private _relaysAvailablePromise?: Promise<void>;
@@ -70,15 +70,9 @@ export default class RpcNetwork {
 
   get ready(): Promise<void> {
     if (!this._ready) {
-      let dht = this._swarm.dht;
-      if (typeof dht === "function") {
-        dht = dht();
-      }
-      if (isPromise(dht)) {
-        this._ready = dht.then((dht: any) => dht.ready());
-      } else {
-        this._ready = this._swarm.dht.ready() as Promise<void>;
-      }
+      this._ready = maybeGetAsyncProperty(this._swarm.dht).then((dht: any) =>
+        dht.ready()
+      ) as Promise<void>;
     }
 
     return this._ready as Promise<void>;