From f9bf14d69716f98a3731acc1480ddddb31ca8609 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Sat, 25 Mar 2023 11:26:22 -0400
Subject: [PATCH] *Use maybeGetAsyncProperty

---
 src/query/simple.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/query/simple.ts b/src/query/simple.ts
index c8c0fc1..00c3250 100644
--- a/src/query/simple.ts
+++ b/src/query/simple.ts
@@ -5,6 +5,7 @@ import b4a from "b4a";
 import {
   hashQuery,
   isPromise,
+  maybeGetAsyncProperty,
   setupStream,
   validateTimestampedResponse,
 } from "../util.js";
@@ -44,7 +45,7 @@ export default class SimpleRpcQuery extends RpcQueryBase {
     let socket = this._relay;
 
     if (socket) {
-      if (socket === "string") {
+      if (typeof socket === "string") {
         try {
           const relay = this._network.getRelay(socket);
           if (this._network.getRelay(socket)) {
@@ -53,7 +54,7 @@ export default class SimpleRpcQuery extends RpcQueryBase {
         } catch {}
       }
 
-      if (socket === "string") {
+      if (typeof socket === "string") {
         try {
           socket = this._network.swarm.connect(b4a.from(this._relay, "hex"));
           if (isPromise(socket)) {
@@ -106,7 +107,10 @@ export default class SimpleRpcQuery extends RpcQueryBase {
     if (
       !response.error &&
       !validateTimestampedResponse(
-        b4a.from(this._relay.remotePublicKey, "hex") as Buffer,
+        b4a.from(
+          await maybeGetAsyncProperty(this._relay.remotePublicKey),
+          "hex"
+        ) as Buffer,
         response
       )
     ) {