From bf7e00d32a03c34f061c07ef653f2df5a79f0908 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Tue, 18 Apr 2023 15:29:28 -0300 Subject: [PATCH] hotfix types. --- nip19.ts | 1 + pool.ts | 4 ++-- relay.ts | 7 ++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/nip19.ts b/nip19.ts index 00c0fd5..f343960 100644 --- a/nip19.ts +++ b/nip19.ts @@ -25,6 +25,7 @@ export type AddressPointer = { export type DecodeResult = | {type: 'nprofile'; data: ProfilePointer} + | {type: 'nrelay'; data: string} | {type: 'nevent'; data: EventPointer} | {type: 'naddr'; data: AddressPointer} | {type: 'nsec'; data: string} diff --git a/pool.ts b/pool.ts index f6ea3f6..840e0de 100644 --- a/pool.ts +++ b/pool.ts @@ -2,7 +2,7 @@ import {Relay, relayInit} from './relay' import {normalizeURL} from './utils' import {Filter} from './filter' import {Event} from './event' -import {SubscriptionOptions, Sub, Pub} from './relay' +import {SubscriptionOptions, Sub, Pub, CountPayload} from './relay' export class SimplePool { private _conn: {[url: string]: Relay} @@ -53,7 +53,7 @@ export class SimplePool { } let subs: Sub[] = [] - let eventListeners: Set<(event: Event) => void> = new Set() + let eventListeners: Set = new Set() let eoseListeners: Set<() => void> = new Set() let eosesMissing = relays.length diff --git a/relay.ts b/relay.ts index 17d59d5..822d19a 100644 --- a/relay.ts +++ b/relay.ts @@ -11,7 +11,7 @@ type RelayEvent = { notice: (msg: string) => void | Promise auth: (challenge: string) => void | Promise } -type CountPayload = { +export type CountPayload = { count: number } type SubEvent = { @@ -371,10 +371,7 @@ export function relayInit( resolve(event) }) }), - count: ( - filters: Filter[], - opts?: SubscriptionOptions - ): Promise => + count: (filters: Filter[]): Promise => new Promise(resolve => { let s = sub(filters, {...sub, verb: 'COUNT'}) let timeout = setTimeout(() => {