laantungir/nostr-tools
1
0
Fork 0
mirror of https://github.com/nbd-wtf/nostr-tools.git synced 2025-12-09 00:28:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

make relay.connect() an awaitable thing.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

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

2
package.json
View File

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

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