Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: handle nwc reply

Browse Source
This commit is contained in:
Kieran 2023-05-08 15:48:42 +01:00
parent 9d67da3b6f
commit 1923273f6f
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/app/src/Wallet/NostrWalletConnect.ts
View File

@ -117,9 +117,9 @@ export class NostrConnectWallet implements LNWallet {
throw new WalletError(WalletErrorCode.GeneralError, "No pending command found"); throw new WalletError(WalletErrorCode.GeneralError, "No pending command found");
} }
const body = JSON.parse(await EventExt.decryptData(e.content, this.#config.secret, this.#config.walletPubkey)); pending.resolve(e.content);
pending.resolve(body);
this.#commandQueue.delete(replyTo[1]); this.#commandQueue.delete(replyTo[1]);
this.#conn?.CloseReq(sub);
} }
async #rpc<T>(method: string, params: Record<string, string>) { async #rpc<T>(method: string, params: Record<string, string>) {
@ -135,12 +135,30 @@ export class NostrConnectWallet implements LNWallet {
.tag(["p", this.#config.walletPubkey]); .tag(["p", this.#config.walletPubkey]);
const evCommand = await eb.buildAndSign(this.#config.secret); const evCommand = await eb.buildAndSign(this.#config.secret);
this.#conn.QueueReq(
[
"REQ",
evCommand.id.slice(0, 12),
{
kinds: [23195],
authors: [this.#config.walletPubkey],
["#e"]: [evCommand.id],
},
],
() => {
// ignored
}
);
await this.#conn.SendAsync(evCommand); await this.#conn.SendAsync(evCommand);
/*return await new Promise<T>((resolve, reject) => { return await new Promise<T>((resolve, reject) => {
this.#commandQueue.set(evCommand.id, { this.#commandQueue.set(evCommand.id, {
resolve, reject resolve: async (o: string) => {
}) const reply = JSON.parse(await EventExt.decryptData(o, this.#config.secret, this.#config.walletPubkey));
})*/ console.debug("NWC", reply);
return {} as T; resolve(reply);
},
reject,
});
});
} }
} }