@nostrify/nostrify 0.49.2 → 0.50.1

package/.turbo/turbo-build.log

@@ -1,32 +1,32 @@
 
-> @nostrify/nostrify@0.49.1 build /home/alex/Projects/nostrify/packages/nostrify
+> @nostrify/nostrify@0.50.1 build /home/alex/Projects/nostrify/packages/nostrify
 > npx tsc -p tsconfig.json && node ../../esbuild.config.js --package ./
 
 npm warn Unknown env config "verify-deps-before-run". This will stop working in the next major version of npm.
 npm warn Unknown env config "_jsr-registry". This will stop working in the next major version of npm.
 Building with esbuild...
 
-  dist/NRelay1.js                       8.9kb
-  dist/NSchema.js                       5.7kb
-  dist/NPool.js                         5.4kb
-  dist/test/TestRelayServer.js          4.4kb
-  dist/NSet.js                          4.1kb
-  dist/NConnectSigner.js                3.9kb
-  dist/ln/LNURL.js                      3.3kb
-  dist/NIP98.js                         2.7kb
-  dist/NBrowserSigner.js                2.6kb
-  dist/uploaders/BlossomUploader.js     1.9kb
-  dist/uploaders/NostrBuildUploader.js  1.9kb
-  dist/test/MockRelay.js                1.4kb
-  dist/BunkerURI.js                     1.4kb
-  dist/NKinds.js                        1.1kb
-  dist/NIP05.js                         1.1kb
-  dist/NSecSigner.js                    1.1kb
-  dist/utils/Machina.js                 925b 
-  dist/NCache.js                        828b 
-  dist/mod.js                           815b 
-  dist/test/mod.js                      701b 
+  dist/NRelay1.js                       10.7kb
+  dist/NSchema.js                        8.2kb
+  dist/NPool.js                          5.5kb
+  dist/test/TestRelayServer.js           4.4kb
+  dist/NSet.js                           4.1kb
+  dist/NConnectSigner.js                 3.9kb
+  dist/ln/LNURL.js                       3.3kb
+  dist/NIP98.js                          2.7kb
+  dist/NBrowserSigner.js                 2.6kb
+  dist/uploaders/BlossomUploader.js      1.9kb
+  dist/uploaders/NostrBuildUploader.js   1.9kb
+  dist/test/MockRelay.js                 1.4kb
+  dist/BunkerURI.js                      1.4kb
+  dist/NKinds.js                         1.1kb
+  dist/NIP05.js                          1.1kb
+  dist/NSecSigner.js                     1.1kb
+  dist/utils/Machina.js                  925b 
+  dist/NCache.js                         828b 
+  dist/mod.js                            815b 
+  dist/test/mod.js                       701b 
   ...and 11 more output files...
 
-⚡ Done in 15ms
+⚡ Done in 17ms
 Done!

package/.turbo/turbo-test.log

@@ -1,109 +1,110 @@
 
 
-> @nostrify/nostrify@0.49.1 test /home/alex/Projects/nostrify/packages/nostrify
+> @nostrify/nostrify@0.50.0 test /home/alex/Projects/nostrify/packages/nostrify
 > node --test "**/*.test.ts"
 
-✔ BunkerURI (2.855929ms)
-✔ BunkerURI.fromJSON (0.647302ms)
-✔ NBrowserSigner - without extension (5.614283ms)
-✔ NBrowserSigner - with extension polyfill (162.64428ms)
-✔ NBrowserSigner.nip44 - with extension polyfill (35.751206ms)
-✔ NBrowserSigner.nip04 - with extension polyfill (24.897688ms)
-✔ NBrowserSigner.getRelays - with extension polyfill (1.639964ms)
-✔ NBrowserSigner - missing nip44 support (0.681486ms)
-✔ NBrowserSigner - missing nip04 support (0.334181ms)
-✔ NBrowserSigner - feature detection (2.345656ms)
-✔ NCache (4.846063ms)
-✔ NConnectSigner.signEvent with nip04 encryption (284.998411ms)
-✔ NConnectSigner.signEvent with nip44 encryption (79.574293ms)
-✔ NIP05.lookup (94.266524ms)
-✔ NIP05.lookup with invalid values but valid profile pointer (6.109077ms)
-✔ NIP05.lookup with invalid document (7.362813ms)
-✔ NIP50.parseInput (6.692668ms)
-✔ NIP50.parseInput with negated token (0.459908ms)
-✔ NIP98.template (7.800118ms)
-✔ NIP98.template with payload (57.504461ms)
-✔ NIP98.verify (167.402989ms)
-✔ NIP98.verify fails with missing header (1.462579ms)
-✔ NIP98.verify fails with missing token (1.026357ms)
-✔ NIP98.verify fails with invalid token (1.318398ms)
-✔ NIP98.verify fails with invalid event (15.517318ms)
-✔ NIP98.verify fails with wrong event kind (15.461533ms)
-✔ NIP98.verify fails with wrong request URL (12.774894ms)
-✔ NIP98.verify fails with wrong request method (15.755518ms)
-✔ NIP98.verify fails with expired event (11.549622ms)
-✔ NIP98.verify fails with invalid payload (25.108065ms)
-✔ NIP98Client.fetch - basic GET request (152.34065ms)
-✔ NIP98Client.fetch - POST request with body (48.046766ms)
-✔ NIP98Client.fetch - with Request object input (22.539248ms)
-✔ NIP98Client.fetch - with URL object input (14.907818ms)
-✔ NIP98Client.fetch - uses default fetch when not provided (11.87691ms)
-✔ NIP98Client.fetch - preserves existing headers (16.091842ms)
-✔ NIP98Client.fetch - event can be verified with NIP98.verify (20.434596ms)
-✔ NIP98Client.fetch - handles different HTTP methods (54.082414ms)
-✔ NKinds (5.032997ms)
-✔ NPool.query (378.702333ms)
-✔ NPool.req (77.556426ms)
-✔ NPool.event (32.572729ms)
-✔ NPool.query with eoseTimeout (559.204759ms)
-✔ NPool.query with eoseTimeout disabled (519.68897ms)
-✔ NRelay1.query (226.319484ms)
-✔ NRelay1.query mismatched filter (27.633319ms)
-✔ NRelay1.req (66.241496ms)
-✔ NRelay1.event (12.452346ms)
-﹣ NRelay1 backoff (0.21217ms) # SKIP
+✔ BunkerURI (2.746358ms)
+✔ BunkerURI.fromJSON (0.592066ms)
+✔ NBrowserSigner - without extension (2.480267ms)
+✔ NBrowserSigner - with extension polyfill (166.202262ms)
+✔ NBrowserSigner.nip44 - with extension polyfill (48.982883ms)
+✔ NBrowserSigner.nip04 - with extension polyfill (24.263617ms)
+✔ NBrowserSigner.getRelays - with extension polyfill (1.466605ms)
+✔ NBrowserSigner - missing nip44 support (1.647116ms)
+✔ NBrowserSigner - missing nip04 support (0.388212ms)
+✔ NBrowserSigner - feature detection (1.960176ms)
+✔ NCache (11.489503ms)
+✔ NConnectSigner.signEvent with nip04 encryption (236.48745ms)
+✔ NConnectSigner.signEvent with nip44 encryption (72.89594ms)
+✔ NIP05.lookup (83.374316ms)
+✔ NIP05.lookup with invalid values but valid profile pointer (12.756762ms)
+✔ NIP05.lookup with invalid document (20.462881ms)
+✔ NIP50.parseInput (7.233418ms)
+✔ NIP50.parseInput with negated token (0.507317ms)
+✔ NIP98.template (4.503421ms)
+✔ NIP98.template with payload (22.610571ms)
+✔ NIP98.verify (166.641341ms)
+✔ NIP98.verify fails with missing header (3.102239ms)
+✔ NIP98.verify fails with missing token (1.647737ms)
+✔ NIP98.verify fails with invalid token (2.754143ms)
+✔ NIP98.verify fails with invalid event (20.081863ms)
+✔ NIP98.verify fails with wrong event kind (25.410189ms)
+✔ NIP98.verify fails with wrong request URL (19.265203ms)
+✔ NIP98.verify fails with wrong request method (25.121986ms)
+✔ NIP98.verify fails with expired event (14.228117ms)
+✔ NIP98.verify fails with invalid payload (45.486742ms)
+✔ NIP98Client.fetch - basic GET request (162.816349ms)
+✔ NIP98Client.fetch - POST request with body (45.826032ms)
+✔ NIP98Client.fetch - with Request object input (38.387778ms)
+✔ NIP98Client.fetch - with URL object input (25.195494ms)
+✔ NIP98Client.fetch - uses default fetch when not provided (11.27616ms)
+✔ NIP98Client.fetch - preserves existing headers (13.853149ms)
+✔ NIP98Client.fetch - event can be verified with NIP98.verify (36.586932ms)
+✔ NIP98Client.fetch - handles different HTTP methods (65.246167ms)
+✔ NKinds (3.899813ms)
+✔ NPool.query (480.159465ms)
+✔ NPool.req (162.806249ms)
+✔ NPool.event (85.226228ms)
+✔ NPool.query with eoseTimeout (625.249102ms)
+✔ NPool.query with eoseTimeout disabled (538.136077ms)
+✔ NRelay1.query (316.888891ms)
+✔ NRelay1.query with NIP-50 search preserves relay order (101.77541ms)
+✔ NRelay1.query mismatched filter (35.660044ms)
+✔ NRelay1.req (107.715539ms)
+✔ NRelay1.event (27.486574ms)
+﹣ NRelay1 backoff (0.35573ms) # SKIP
 ▶ NRelay1 idleTimeout
-  ✔ websocket opens (2.256778ms)
-  ✔ websocket closes after idleTimeout (150.482082ms)
-  ✔ websocket wakes up during activity (17.379211ms)
-✔ NRelay1 idleTimeout (173.173788ms)
-✔ NRelay1.count rejects when the server sends CLOSED (7.752588ms)
-✔ NRelay1 closes when it receives a binary message (5.304398ms)
-✔ n.id (11.977479ms)
-✔ n.bech32 (4.31372ms)
-✔ n.filter (83.609146ms)
-✔ n.event (39.732538ms)
-✔ n.metadata (67.78575ms)
-✔ NSecSigner (134.833466ms)
-✔ NSecSigner.nip44 (39.725124ms)
-✔ NSet (26.167433ms)
-✔ NSet.add (replaceable) (0.555688ms)
-✔ NSet.add (parameterized) (0.859632ms)
-✔ NSet.add (deletion) (0.659384ms)
-✔ Construct a RelayError from the reason message (2.48014ms)
-✔ Throw a new RelayError if the OK message is false (0.480627ms)
-✔ LNURL.fromString (7.853168ms)
-✔ LNURL.fromLightningAddress (1.565174ms)
-✔ LNURL.toString (1.207389ms)
-✔ LNURL.getDetails (61.890516ms)
-✔ LNURL.getInvoice (12.594574ms)
-✔ ErrorRelay (89.704386ms)
-✔ MockRelay (5.643569ms)
-✔ BlossomUploader.upload (685.760126ms)
-✖ NostrBuildUploader.upload (25.389164ms)
-✔ CircularSet (2.759166ms)
-✔ push, iterate, & close (103.744176ms)
-✔ close & reopen (0.695512ms)
-✔ aborts with signal (51.384223ms)
-✔ already aborted signal in constructor (0.622785ms)
-✔ push after abort (0.654174ms)
-✔ multiple messages in queue (0.316858ms)
-✔ N64 (18.170805ms)
-✔ N64.encodeEvent (0.414843ms)
-✔ N64.decodeEvent (4.505341ms)
-ℹ tests 87
+  ✔ websocket opens (4.890911ms)
+  ✔ websocket closes after idleTimeout (150.939876ms)
+  ✔ websocket wakes up during activity (31.703544ms)
+✔ NRelay1 idleTimeout (193.2402ms)
+✔ NRelay1.count rejects when the server sends CLOSED (21.977147ms)
+✔ NRelay1 closes when it receives a binary message (9.325142ms)
+✔ n.id (19.213084ms)
+✔ n.bech32 (3.798672ms)
+✔ n.filter (47.81926ms)
+✔ n.event (34.382045ms)
+✔ n.metadata (68.049272ms)
+✔ NSecSigner (110.350227ms)
+✔ NSecSigner.nip44 (32.295571ms)
+✔ NSet (42.044732ms)
+✔ NSet.add (replaceable) (0.57253ms)
+✔ NSet.add (parameterized) (1.000306ms)
+✔ NSet.add (deletion) (0.450089ms)
+✔ Construct a RelayError from the reason message (2.143422ms)
+✔ Throw a new RelayError if the OK message is false (0.52506ms)
+✔ LNURL.fromString (7.847636ms)
+✔ LNURL.fromLightningAddress (1.686861ms)
+✔ LNURL.toString (1.142133ms)
+✔ LNURL.getDetails (86.164146ms)
+✔ LNURL.getInvoice (13.898675ms)
+✔ ErrorRelay (94.163638ms)
+✔ MockRelay (3.052615ms)
+✔ BlossomUploader.upload (733.428376ms)
+✖ NostrBuildUploader.upload (33.449327ms)
+✔ CircularSet (2.438347ms)
+✔ push, iterate, & close (107.313622ms)
+✔ close & reopen (0.74796ms)
+✔ aborts with signal (52.688019ms)
+✔ already aborted signal in constructor (0.717774ms)
+✔ push after abort (3.810805ms)
+✔ multiple messages in queue (0.582538ms)
+✔ N64 (17.530693ms)
+✔ N64.encodeEvent (0.432495ms)
+✔ N64.decodeEvent (4.268328ms)
+ℹ tests 88
 ℹ suites 0
-ℹ pass 85
+ℹ pass 86
 ℹ fail 1
 ℹ cancelled 0
 ℹ skipped 1
 ℹ todo 0
-ℹ duration_ms 3425.548766
+ℹ duration_ms 3673.242963
 
 ✖ failing tests:
 
 test at uploaders/NostrBuildUploader.test.ts:12:7
-✖ NostrBuildUploader.upload (25.389164ms)
+✖ NostrBuildUploader.upload (33.449327ms)
   Error: nostr.build with default uploader requires a secret key to be configured
       at TestContext.<anonymous> (file:///home/alex/Projects/nostrify/packages/nostrify/uploaders/NostrBuildUploader.test.ts:25:13)
       at process.processTicksAndRejections (node:internal/process/task_queues:104:5)

package/.turbo/turbo-typecheck.log

@@ -1,5 +1,5 @@
 
-> @nostrify/nostrify@0.49.1 typecheck /home/alex/Projects/nostrify/packages/nostrify
+> @nostrify/nostrify@0.50.1 typecheck /home/alex/Projects/nostrify/packages/nostrify
 > npx tsc --noEmit
 
 npm warn Unknown env config "verify-deps-before-run". This will stop working in the next major version of npm.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.50.1
+
+### Patch Changes
+
+- Fix eoseTimeout to only apply to `query()`, not `req()`. Previously, the EOSE timeout would abort streaming subscriptions via `req()` after the first relay sent EOSE, preventing callers from receiving events past EOSE.
+
+## 0.50.0
+
+### Minor Changes
+
+- Add NIP-11 relay information document support to NRelay1 with `getRelayInfo()` method and `NSchema.relayInfo()` validation schema. Fix NRelay1.query to preserve relay-provided ordering for NIP-50 search filters instead of sorting by created_at.
+
 ## 0.49.2
 
 ### Patch Changes

package/NPool.ts

@@ -102,7 +102,7 @@ export class NPool<T extends NRelay = NRelay> implements NRelay {
    */
   async *req(
     filters: NostrFilter[],
-    opts?: { signal?: AbortSignal; relays?: string[] },
+    opts?: { signal?: AbortSignal; relays?: string[]; eoseTimeout?: number },
   ): AsyncIterable<NostrRelayEVENT | NostrRelayEOSE | NostrRelayCLOSED> {
     const controller = new AbortController();
     const signal = opts?.signal ? AbortSignal.any([opts.signal, controller.signal]) : controller.signal;
@@ -123,7 +123,7 @@ export class NPool<T extends NRelay = NRelay> implements NRelay {
     const closes = new Set<string>();
     const events = new CircularSet<string>(1000);
 
-    const eoseTimeout = this.opts.eoseTimeout ?? 1000;
+    const eoseTimeout = opts?.eoseTimeout;
     let timeoutId: ReturnType<typeof setTimeout> | undefined;
 
     const relayPromises: Promise<void>[] = [];
@@ -136,7 +136,7 @@ export class NPool<T extends NRelay = NRelay> implements NRelay {
             if (msg[0] === 'EOSE') {
               eoses.add(url);
               // Start timeout after first EOSE if timeout is enabled
-              if (eoses.size === 1 && eoseTimeout > 0 && timeoutId === undefined) {
+              if (eoses.size === 1 && eoseTimeout !== undefined && eoseTimeout > 0 && timeoutId === undefined) {
                 timeoutId = setTimeout(() => {
                   controller.abort();
                 }, eoseTimeout);
@@ -226,8 +226,10 @@ export class NPool<T extends NRelay = NRelay> implements NRelay {
     );
     if (limit === 0) return [];
 
+    const eoseTimeout = this.opts.eoseTimeout ?? 1000;
+
     try {
-      for await (const msg of this.req(filters, opts)) {
+      for await (const msg of this.req(filters, { ...opts, eoseTimeout })) {
         if (msg[0] === 'EOSE') break;
         if (msg[0] === 'EVENT') events.add(msg[2]);
         if (msg[0] === 'CLOSED') break;

package/NRelay1.test.ts

@@ -36,6 +36,38 @@ await test("NRelay1.query", async () => {
   clearTimeout(tid);
 });
 
+await test("NRelay1.query with NIP-50 search preserves relay order", async () => {
+  // Create events with different timestamps. The relay will send them
+  // in "relevance" order (oldest first), not chronological order.
+  const sk = generateSecretKey();
+  const oldest = genEvent({ kind: 1, content: "most relevant", created_at: 1000 }, sk);
+  const middle = genEvent({ kind: 1, content: "somewhat relevant", created_at: 2000 }, sk);
+  const newest = genEvent({ kind: 1, content: "least relevant", created_at: 3000 }, sk);
+
+  // Relay sends in relevance order: oldest, middle, newest.
+  // Without the fix, NSet would sort them newest-first by created_at.
+  await using server = await TestRelayServer.create({
+    handleMessage(socket, msg) {
+      if (msg[0] === "REQ") {
+        const [, subId] = msg;
+        socket.send(JSON.stringify(["EVENT", subId, oldest]));
+        socket.send(JSON.stringify(["EVENT", subId, middle]));
+        socket.send(JSON.stringify(["EVENT", subId, newest]));
+        socket.send(JSON.stringify(["EOSE", subId]));
+      }
+    },
+  });
+
+  await using relay = new NRelay1(server.url);
+  const events = await relay.query([{ kinds: [1], search: "relevant" }]);
+
+  deepStrictEqual(events.length, 3);
+  // Results should preserve relay order (relevance), not be sorted by created_at.
+  deepStrictEqual(events[0].id, oldest.id);
+  deepStrictEqual(events[1].id, middle.id);
+  deepStrictEqual(events[2].id, newest.id);
+});
+
 await test("NRelay1.query mismatched filter", async () => {
   await using server = await TestRelayServer.create({
     handleMessage(socket, msg) {

package/NRelay1.ts

@@ -10,6 +10,7 @@ import type {
   NostrRelayMsg,
   NostrRelayNOTICE,
   NostrRelayOK,
+  NostrRelayInfo,
   NRelay,
 } from '@nostrify/types';
 import { getFilterLimit, matchFilters, verifyEvent as _verifyEvent } from 'nostr-tools';
@@ -28,7 +29,7 @@ type EventMap = {
   notice: NostrRelayNOTICE;
 };
 
-/** Options used for constructing an `NRelay1` instance. */
+  /** Options used for constructing an `NRelay1` instance. */
 export interface NRelay1Opts {
   /** Respond to `AUTH` challenges by producing a signed kind `22242` event. */
   auth?(challenge: string): Promise<NostrEvent>;
@@ -40,6 +41,8 @@ export interface NRelay1Opts {
   verifyEvent?(event: NostrEvent): boolean;
   /** Logger callback. */
   log?(log: NRelay1Log): void;
+  /** Custom fetch function for retrieving NIP-11 relay information. Default: `globalThis.fetch`. */
+  fetch?: typeof globalThis.fetch;
 }
 
 export interface NRelay1Log {
@@ -58,6 +61,7 @@ export class NRelay1 implements NRelay {
   private controller = new AbortController();
   private url: string;
   private opts: NRelay1Opts;
+  private relayInfoPromise?: Promise<NostrRelayInfo | undefined>;
 
   private ee = new EventTarget();
 
@@ -76,6 +80,69 @@ export class NRelay1 implements NRelay {
     this.maybeStartIdleTimer();
   }
 
+  /** Fetch the NIP-11 relay information document. */
+  private async fetchRelayInfo(opts?: { signal?: AbortSignal }): Promise<NostrRelayInfo | undefined> {
+    try {
+      const { fetch: fetchFn = globalThis.fetch } = this.opts;
+      const { signal } = opts || {};
+      
+      const httpUrl = this.url.replace(/^wss?:\/\//, (match) => 
+        match === 'ws://' ? 'http://' : 'https://'
+      );
+      
+      const response = await fetchFn(httpUrl, {
+        headers: { Accept: 'application/nostr+json' },
+        signal,
+      });
+      
+      if (!response.ok) {
+        this.log({
+          level: 'warn',
+          ns: 'relay.nip11',
+          status: response.status,
+          message: 'Failed to fetch relay info',
+        });
+        return undefined;
+      }
+      
+      const data = await response.json();
+      const result = n.relayInfo().safeParse(data);
+      
+      if (!result.success) {
+        this.log({
+          level: 'warn',
+          ns: 'relay.nip11',
+          error: result.error,
+          message: 'Invalid relay info format',
+        });
+        return undefined;
+      }
+      
+      this.log({
+        level: 'debug',
+        ns: 'relay.nip11',
+        message: 'Successfully fetched relay info',
+      });
+      return result.data as NostrRelayInfo;
+    } catch (error) {
+      this.log({
+        level: 'warn',
+        ns: 'relay.nip11',
+        error: error instanceof Error ? error : new Error(String(error)),
+        message: 'Error fetching relay info',
+      });
+      return undefined;
+    }
+  }
+
+  /** Get the NIP-11 relay information document. Fetches on first call and caches the result. */
+  async getRelayInfo(opts?: { signal?: AbortSignal }): Promise<NostrRelayInfo | undefined> {
+    if (!this.relayInfoPromise) {
+      this.relayInfoPromise = this.fetchRelayInfo(opts);
+    }
+    return this.relayInfoPromise;
+  }
+
   /** Create (and open) a WebSocket connection with automatic reconnect. */
   private createSocket(): Websocket {
     const { backoff = new ExponentialBackoff(1000) } = this.opts;
@@ -255,7 +322,8 @@ export class NRelay1 implements NRelay {
     filters: NostrFilter[],
     opts?: { signal?: AbortSignal },
   ): Promise<NostrEvent[]> {
-    const events = new NSet();
+    const map = new Map<string, NostrEvent>();
+    const events = new NSet(map);
 
     const limit = filters.reduce(
       (result, filter) => result + getFilterLimit(filter),
@@ -273,7 +341,12 @@ export class NRelay1 implements NRelay {
       }
     }
 
-    return [...events];
+    // Don't sort results of search filters.
+    if (filters.some((filter) => typeof filter.search === 'string')) {
+      return [...map.values()];
+    } else {
+      return [...events];
+    }
   }
 
   async event(

package/NSchema.ts

@@ -217,6 +217,51 @@ class NSchema {
     });
   }
 
+  /** NIP-11 Relay Information Document schema. */
+  static relayInfo() {
+    return z.looseObject({
+      name: z.string().optional().catch(undefined),
+      description: z.string().optional().catch(undefined),
+      pubkey: NSchema.id().optional().catch(undefined),
+      contact: z.string().optional().catch(undefined),
+      supported_nips: z.number().int().nonnegative().array().optional().catch(undefined),
+      software: z.string().optional().catch(undefined),
+      version: z.string().optional().catch(undefined),
+      limitation: z.looseObject({
+        max_message_length: z.number().int().nonnegative().optional().catch(undefined),
+        max_subscriptions: z.number().int().nonnegative().optional().catch(undefined),
+        max_filters: z.number().int().nonnegative().optional().catch(undefined),
+        max_limit: z.number().int().nonnegative().optional().catch(undefined),
+        max_subid_length: z.number().int().nonnegative().optional().catch(undefined),
+        max_event_tags: z.number().int().nonnegative().optional().catch(undefined),
+        max_content_length: z.number().int().nonnegative().optional().catch(undefined),
+        min_pow_difficulty: z.number().int().nonnegative().optional().catch(undefined),
+        auth_required: z.boolean().optional().catch(undefined),
+        payment_required: z.boolean().optional().catch(undefined),
+        restricted_writes: z.boolean().optional().catch(undefined),
+        created_at_lower_limit: z.number().int().nonnegative().optional().catch(undefined),
+        created_at_upper_limit: z.number().int().nonnegative().optional().catch(undefined),
+      }).optional().catch(undefined),
+      retention: z.array(z.object({
+        time: z.number().int().nullable(),
+        count: z.number().int().nonnegative().optional(),
+        kinds: z.number().int().nonnegative().array().optional(),
+      })).optional().catch(undefined),
+      relay_countries: z.string().array().optional().catch(undefined),
+      language_tags: z.string().array().optional().catch(undefined),
+      tags: z.string().array().optional().catch(undefined),
+      posting_policy: z.string().optional().catch(undefined),
+      payments_url: z.string().optional().catch(undefined),
+      fees: z.record(z.string(), z.array(z.object({
+        amount: z.number(),
+        unit: z.string(),
+        period: z.number().int().nonnegative().optional(),
+        kinds: z.number().int().nonnegative().array().optional(),
+      }))).optional().catch(undefined),
+      icon: z.string().optional().catch(undefined),
+    });
+  }
+
   /** NIP-46 request content schema. */
   static connectRequest() {
     return z.object({

package/dist/NPool.d.ts

@@ -60,6 +60,7 @@ export declare class NPool<T extends NRelay = NRelay> implements NRelay {
     req(filters: NostrFilter[], opts?: {
         signal?: AbortSignal;
         relays?: string[];
+        eoseTimeout?: number;
     }): AsyncIterable<NostrRelayEVENT | NostrRelayEOSE | NostrRelayCLOSED>;
     /**
      * Events are sent to relays according to the `eventRouter`.

package/dist/NPool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NPool.d.ts","sourceRoot":"","sources":["../NPool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,MAAM,EACP,MAAM,iBAAiB,CAAC;AAOzB,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,MAAM;IACzC,sDAAsD;IACtD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC;IACrB,8JAA8J;IAC9J,SAAS,CACP,OAAO,EAAE,WAAW,EAAE,GAEpB,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,GAClC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAChD,mJAAmJ;IACnJ,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7D,8JAA8J;IAC9J,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,YAAW,MAAM;IAC7D,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,IAAI,CAAe;gBAEf,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAI9B,wDAAwD;IACjD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC;IAY5B,6GAA6G;IACtG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;IAQtC,IAAW,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAE1C;IAED;;;;;;;;;OASG;IACI,GAAG,CACR,OAAO,EAAE,WAAW,EAAE,EACtB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GACjD,aAAa,CAAC,eAAe,GAAG,cAAc,GAAG,gBAAgB,CAAC;IA6ErE;;;;OAIG;IACG,KAAK,CACT,KAAK,EAAE,UAAU,EACjB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GACjD,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;;;;;;;OAWG;IACG,KAAK,CACT,OAAO,EAAE,WAAW,EAAE,EACtB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GACjD,OAAO,CAAC,UAAU,EAAE,CAAC;IA4BxB,wCAAwC;IAClC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7C"}
+{"version":3,"file":"NPool.d.ts","sourceRoot":"","sources":["../NPool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,MAAM,EACP,MAAM,iBAAiB,CAAC;AAOzB,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,MAAM;IACzC,sDAAsD;IACtD,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC;IACrB,8JAA8J;IAC9J,SAAS,CACP,OAAO,EAAE,WAAW,EAAE,GAEpB,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,GAClC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAChD,mJAAmJ;IACnJ,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7D,8JAA8J;IAC9J,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,YAAW,MAAM;IAC7D,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,IAAI,CAAe;gBAEf,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IAI9B,wDAAwD;IACjD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC;IAY5B,6GAA6G;IACtG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;IAQtC,IAAW,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAE1C;IAED;;;;;;;;;OASG;IACI,GAAG,CACR,OAAO,EAAE,WAAW,EAAE,EACtB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GACvE,aAAa,CAAC,eAAe,GAAG,cAAc,GAAG,gBAAgB,CAAC;IA6ErE;;;;OAIG;IACG,KAAK,CACT,KAAK,EAAE,UAAU,EACjB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GACjD,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;;;;;;;OAWG;IACG,KAAK,CACT,OAAO,EAAE,WAAW,EAAE,EACtB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GACjD,OAAO,CAAC,UAAU,EAAE,CAAC;IA8BxB,wCAAwC;IAClC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7C"}

package/dist/NPool.js

@@ -51,7 +51,7 @@ class NPool {
     const eoses = /* @__PURE__ */ new Set();
     const closes = /* @__PURE__ */ new Set();
     const events = new CircularSet(1e3);
-    const eoseTimeout = this.opts.eoseTimeout ?? 1e3;
+    const eoseTimeout = opts?.eoseTimeout;
     let timeoutId;
     const relayPromises = [];
     for (const [url, filters2] of routes.entries()) {
@@ -61,7 +61,7 @@ class NPool {
           for await (const msg of relay.req(filters2, { signal })) {
             if (msg[0] === "EOSE") {
               eoses.add(url);
-              if (eoses.size === 1 && eoseTimeout > 0 && timeoutId === void 0) {
+              if (eoses.size === 1 && eoseTimeout !== void 0 && eoseTimeout > 0 && timeoutId === void 0) {
                 timeoutId = setTimeout(() => {
                   controller.abort();
                 }, eoseTimeout);
@@ -135,8 +135,9 @@ class NPool {
       0
     );
     if (limit === 0) return [];
+    const eoseTimeout = this.opts.eoseTimeout ?? 1e3;
     try {
-      for await (const msg of this.req(filters, opts)) {
+      for await (const msg of this.req(filters, { ...opts, eoseTimeout })) {
         if (msg[0] === "EOSE") break;
         if (msg[0] === "EVENT") events.add(msg[2]);
         if (msg[0] === "CLOSED") break;

package/dist/NRelay1.d.ts

@@ -1,4 +1,4 @@
-import type { NostrClientMsg, NostrClientREQ, NostrEvent, NostrFilter, NostrRelayCLOSED, NostrRelayEOSE, NostrRelayEVENT, NostrRelayMsg, NRelay } from '@nostrify/types';
+import type { NostrClientMsg, NostrClientREQ, NostrEvent, NostrFilter, NostrRelayCLOSED, NostrRelayEOSE, NostrRelayEVENT, NostrRelayMsg, NostrRelayInfo, NRelay } from '@nostrify/types';
 import { Websocket } from 'websocket-ts';
 import type { Backoff } from 'websocket-ts';
 /** Options used for constructing an `NRelay1` instance. */
@@ -13,6 +13,8 @@ export interface NRelay1Opts {
     verifyEvent?(event: NostrEvent): boolean;
     /** Logger callback. */
     log?(log: NRelay1Log): void;
+    /** Custom fetch function for retrieving NIP-11 relay information. Default: `globalThis.fetch`. */
+    fetch?: typeof globalThis.fetch;
 }
 export interface NRelay1Log {
     level: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal' | 'critical';
@@ -30,10 +32,17 @@ export declare class NRelay1 implements NRelay {
     private controller;
     private url;
     private opts;
+    private relayInfoPromise?;
     private ee;
     get subscriptions(): readonly NostrClientREQ[];
     private log;
     constructor(url: string, opts?: NRelay1Opts);
+    /** Fetch the NIP-11 relay information document. */
+    private fetchRelayInfo;
+    /** Get the NIP-11 relay information document. Fetches on first call and caches the result. */
+    getRelayInfo(opts?: {
+        signal?: AbortSignal;
+    }): Promise<NostrRelayInfo | undefined>;
     /** Create (and open) a WebSocket connection with automatic reconnect. */
     private createSocket;
     /** Handle a NIP-01 relay message. */

package/dist/NRelay1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NRelay1.d.ts","sourceRoot":"","sources":["../NRelay1.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NRelay1.d.ts","sourceRoot":"","sources":["../NRelay1.ts"],"names":[],"mappings":"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"}