coracle/welshman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nip46

Browse Source
This commit is contained in:
Jon Staab
2025-03-31 09:45:44 -07:00
parent 5b55b5f5d0
commit 5245993d4e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/signer/src/signers/nip46.ts
+4 -6
View File
@@ -15,7 +15,7 @@ import {
StampedEvent, StampedEvent,
NOSTR_CONNECT, NOSTR_CONNECT,
} from "@welshman/util" } from "@welshman/util"
import {multireq, multicast, Multireq, RequestEvent, AdapterContext} from "@welshman/net" import {MultiRequest, MultiPublish, RequestEvent, AdapterContext} from "@welshman/net"
import {ISigner, EncryptionImplementation, decrypt, hash, own} from "../util.js" import {ISigner, EncryptionImplementation, decrypt, hash, own} from "../util.js"
import {Nip01Signer} from "./nip01.js" import {Nip01Signer} from "./nip01.js"
@@ -97,7 +97,7 @@ const popupManager = (() => {
})() })()
export class Nip46Receiver extends Emitter { export class Nip46Receiver extends Emitter {
public sub?: Multireq public sub?: MultiRequest
constructor( constructor(
public signer: ISigner, public signer: ISigner,
@@ -114,9 +114,7 @@ export class Nip46Receiver extends Emitter {
const userPubkey = await this.signer.getPubkey() const userPubkey = await this.signer.getPubkey()
const filter = {kinds: [NOSTR_CONNECT], "#p": [userPubkey]} const filter = {kinds: [NOSTR_CONNECT], "#p": [userPubkey]}
this.sub = multireq({relays, filter, context}) this.sub = new MultiRequest({relays, filter, context})
this.sub.on(RequestEvent.Send, resolve)
this.sub.on(RequestEvent.Event, async (event: TrustedEvent, url: string) => { this.sub.on(RequestEvent.Event, async (event: TrustedEvent, url: string) => {
const json = await decrypt(this.signer, event.pubkey, event.content) const json = await decrypt(this.signer, event.pubkey, event.content)
@@ -164,7 +162,7 @@ export class Nip46Sender extends Emitter {
const content = await this.signer[algorithm].encrypt(signerPubkey, payload) const content = await this.signer[algorithm].encrypt(signerPubkey, payload)
const template = createEvent(NOSTR_CONNECT, {content, tags: [["p", signerPubkey]]}) const template = createEvent(NOSTR_CONNECT, {content, tags: [["p", signerPubkey]]})
const event = await this.signer.sign(template) const event = await this.signer.sign(template)
const pub = multicast({relays, event, context}) const pub = new MultiPublish({relays, event, context})
this.emit(Nip46Event.Send, {...request, pub}) this.emit(Nip46Event.Send, {...request, pub})
} }