*Switch to using maybeGetAsyncProperty

This commit is contained in:
Derrick Hammer 2023-03-25 10:51:07 -04:00
parent 5e4617ac55
commit bb36a80913
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 4 additions and 10 deletions

View File

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