make relay.connect() an awaitable thing.

This commit is contained in:
fiatjaf
2022-12-22 08:52:34 -03:00
parent 8262a81cb2
commit ac698ef67d
3 changed files with 61 additions and 57 deletions

View File

@@ -53,7 +53,7 @@ import {
} from 'nostr-tools'
const relay = relayInit('wss://relay.example.com')
relay.connect()
await relay.connect()
relay.on('connect', () => {
console.log(`connected to ${relay.url}`)

View File

@@ -1,6 +1,6 @@
{
"name": "nostr-tools",
"version": "1.0.0-beta2",
"version": "1.0.0-rc1",
"description": "Tools for making a Nostr client.",
"repository": {
"type": "git",

View File

@@ -59,14 +59,17 @@ export function relayInit(url: string): Relay {
}
} = {}
function connectRelay() {
async function connectRelay(): Promise<void> {
return new Promise((resolve, reject) => {
ws = new WebSocket(url)
ws.onopen = () => {
listeners.connect.forEach(cb => cb())
resolve()
}
ws.onerror = () => {
listeners.error.forEach(cb => cb())
reject()
}
ws.onclose = async () => {
listeners.disconnect.forEach(cb => cb())
@@ -121,11 +124,12 @@ export function relayInit(url: string): Relay {
}
}
}
})
}
async function connect(): Promise<void> {
if (ws?.readyState && ws.readyState === 1) return // ws already open
connectRelay()
await connectRelay()
}
async function trySend(params: [string, ...any]) {