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

remove resolveClose, close() is now fire-and-forget.

Browse Source
This commit is contained in:
fiatjaf
2023-02-17 14:51:56 -03:00
parent 0f841138cd
commit 3d93ec8446
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
relay.ts
View File

@@ -10,7 +10,7 @@ export type Relay = {
url: string url: string
status: number status: number
connect: () => Promise<void> connect: () => Promise<void>
close: () => Promise<void> close: () => void
sub: (filters: Filter[], opts?: SubscriptionOptions) => Sub sub: (filters: Filter[], opts?: SubscriptionOptions) => Sub
list: (filters: Filter[], opts?: SubscriptionOptions) => Promise<Event[]> list: (filters: Filter[], opts?: SubscriptionOptions) => Promise<Event[]>
get: (filter: Filter, opts?: SubscriptionOptions) => Promise<Event | null> get: (filter: Filter, opts?: SubscriptionOptions) => Promise<Event | null>
@@ -37,7 +37,6 @@ export type SubscriptionOptions = {
export function relayInit(url: string): Relay { export function relayInit(url: string): Relay {
var ws: WebSocket var ws: WebSocket
var resolveClose: () => void
var openSubs: {[id: string]: {filters: Filter[]} & SubscriptionOptions} = {} var openSubs: {[id: string]: {filters: Filter[]} & SubscriptionOptions} = {}
var listeners: { var listeners: {
connect: Array<() => void> connect: Array<() => void>
@@ -78,7 +77,6 @@ export function relayInit(url: string): Relay {
} }
ws.onclose = async () => { ws.onclose = async () => {
listeners.disconnect.forEach(cb => cb()) listeners.disconnect.forEach(cb => cb())
resolveClose && resolveClose()
} }
let incomingMessageQueue: string[] = [] let incomingMessageQueue: string[] = []
@@ -291,16 +289,13 @@ export function relayInit(url: string): Relay {
} }
}, },
connect, connect,
close(): Promise<void> { close(): void {
listeners = {connect: [], disconnect: [], error: [], notice: []} listeners = {connect: [], disconnect: [], error: [], notice: []}
subListeners = {} subListeners = {}
pubListeners = {} pubListeners = {}
if (ws.readyState > 1) return Promise.resolve() if (ws.readyState > 1) return
ws.close() ws.close()
return new Promise<void>(resolve => {
resolveClose = resolve
})
}, },
get status() { get status() {
return ws?.readyState ?? 3 return ws?.readyState ?? 3