@nostrify/nostrify 0.49.1 → 0.49.2

package/.turbo/turbo-build.log

@@ -7,7 +7,7 @@ npm warn Unknown env config "_jsr-registry". This will stop working in the next
 Building with esbuild...
 
   dist/NRelay1.js                       8.9kb
-  dist/NSchema.js                       5.8kb
+  dist/NSchema.js                       5.7kb
   dist/NPool.js                         5.4kb
   dist/test/TestRelayServer.js          4.4kb
   dist/NSet.js                          4.1kb
@@ -28,5 +28,5 @@ Building with esbuild...
   dist/test/mod.js                      701b 
   ...and 11 more output files...
 
-⚡ Done in 18ms
+⚡ Done in 15ms
 Done!

package/.turbo/turbo-test.log

@@ -1,96 +1,96 @@
 
 
-> @nostrify/nostrify@0.49.0 test /home/alex/Projects/nostrify/packages/nostrify
+> @nostrify/nostrify@0.49.1 test /home/alex/Projects/nostrify/packages/nostrify
 > node --test "**/*.test.ts"
 
-✔ BunkerURI (6.500947ms)
-✔ BunkerURI.fromJSON (0.697366ms)
-✔ NBrowserSigner - without extension (6.845626ms)
-✔ NBrowserSigner - with extension polyfill (145.570371ms)
-✔ NBrowserSigner.nip44 - with extension polyfill (41.798097ms)
-✔ NBrowserSigner.nip04 - with extension polyfill (24.715886ms)
-✔ NBrowserSigner.getRelays - with extension polyfill (1.481235ms)
-✔ NBrowserSigner - missing nip44 support (0.488973ms)
-✔ NBrowserSigner - missing nip04 support (0.305216ms)
-✔ NBrowserSigner - feature detection (0.494443ms)
-✔ NCache (4.851615ms)
-✔ NConnectSigner.signEvent with nip04 encryption (263.040731ms)
-✔ NConnectSigner.signEvent with nip44 encryption (65.206185ms)
-✔ NIP05.lookup (66.927232ms)
-✔ NIP05.lookup with invalid values but valid profile pointer (6.26454ms)
-✔ NIP05.lookup with invalid document (6.817544ms)
-✔ NIP50.parseInput (3.842521ms)
-✔ NIP50.parseInput with negated token (0.457102ms)
-✔ NIP98.template (5.687631ms)
-✔ NIP98.template with payload (26.300896ms)
-✔ NIP98.verify (133.933063ms)
-✔ NIP98.verify fails with missing header (2.675358ms)
-✔ NIP98.verify fails with missing token (1.837347ms)
-✔ NIP98.verify fails with invalid token (1.68541ms)
-✔ NIP98.verify fails with invalid event (22.562873ms)
-✔ NIP98.verify fails with wrong event kind (25.930437ms)
-✔ NIP98.verify fails with wrong request URL (18.756591ms)
-✔ NIP98.verify fails with wrong request method (26.4621ms)
-✔ NIP98.verify fails with expired event (12.038465ms)
-✔ NIP98.verify fails with invalid payload (30.221524ms)
-✔ NIP98Client.fetch - basic GET request (154.787833ms)
-✔ NIP98Client.fetch - POST request with body (47.56551ms)
-✔ NIP98Client.fetch - with Request object input (24.533651ms)
-✔ NIP98Client.fetch - with URL object input (18.555061ms)
-✔ NIP98Client.fetch - uses default fetch when not provided (5.830762ms)
-✔ NIP98Client.fetch - preserves existing headers (7.498448ms)
-✔ NIP98Client.fetch - event can be verified with NIP98.verify (23.18142ms)
-✔ NIP98Client.fetch - handles different HTTP methods (54.413802ms)
-✔ NKinds (2.313314ms)
-✔ NPool.query (304.805977ms)
-✔ NPool.req (71.883744ms)
-✔ NPool.event (36.152295ms)
-✔ NPool.query with eoseTimeout (556.472837ms)
-✔ NPool.query with eoseTimeout disabled (518.148304ms)
-✔ NRelay1.query (214.373313ms)
-✔ NRelay1.query mismatched filter (26.656267ms)
-✔ NRelay1.req (62.61191ms)
-✔ NRelay1.event (15.013378ms)
-﹣ NRelay1 backoff (0.284747ms) # SKIP
+✔ 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
 ▶ NRelay1 idleTimeout
-  ✔ websocket opens (2.521237ms)
-  ✔ websocket closes after idleTimeout (150.608267ms)
-  ✔ websocket wakes up during activity (18.683393ms)
-✔ NRelay1 idleTimeout (174.927484ms)
-✔ NRelay1.count rejects when the server sends CLOSED (8.603564ms)
-✔ NRelay1 closes when it receives a binary message (6.617717ms)
-✔ n.id (13.522796ms)
-✔ n.bech32 (3.250493ms)
-✔ n.filter (54.632765ms)
-✔ n.event (59.738558ms)
-✔ n.metadata (111.976204ms)
-✔ NSecSigner (139.725132ms)
-✔ NSecSigner.nip44 (46.61682ms)
-✔ NSet (19.968067ms)
-✔ NSet.add (replaceable) (0.543556ms)
-✔ NSet.add (parameterized) (0.852168ms)
-✔ NSet.add (deletion) (0.422317ms)
-✔ Construct a RelayError from the reason message (2.066149ms)
-✔ Throw a new RelayError if the OK message is false (0.523077ms)
-✔ LNURL.fromString (13.596875ms)
-✔ LNURL.fromLightningAddress (1.670752ms)
-✔ LNURL.toString (1.414138ms)
-✔ LNURL.getDetails (125.620408ms)
-✔ LNURL.getInvoice (14.385975ms)
-✔ ErrorRelay (102.691184ms)
-✔ MockRelay (3.336506ms)
-✔ BlossomUploader.upload (643.516025ms)
-✖ NostrBuildUploader.upload (12.243372ms)
-✔ CircularSet (2.656663ms)
-✔ push, iterate, & close (103.126316ms)
-✔ close & reopen (0.403963ms)
-✔ aborts with signal (51.238249ms)
-✔ already aborted signal in constructor (0.399534ms)
-✔ push after abort (0.518148ms)
-✔ multiple messages in queue (0.23852ms)
-✔ N64 (8.766331ms)
-✔ N64.encodeEvent (0.227118ms)
-✔ N64.decodeEvent (1.617352ms)
+  ✔ 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
 ℹ suites 0
 ℹ pass 85
@@ -98,12 +98,12 @@
 ℹ cancelled 0
 ℹ skipped 1
 ℹ todo 0
-ℹ duration_ms 3151.150695
+ℹ duration_ms 3425.548766
 
 ✖ failing tests:
 
 test at uploaders/NostrBuildUploader.test.ts:12:7
-✖ NostrBuildUploader.upload (12.243372ms)
+✖ NostrBuildUploader.upload (25.389164ms)
   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/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.49.2
+
+### Patch Changes
+
+- Simplify NSchema by removing explicit zod type annotations and leveraging type inference
+
 ## 0.49.1
 
 ### Patch Changes

package/NSchema.ts

@@ -1,26 +1,6 @@
 import { z } from "zod";
 
-import type {
-  NostrClientAUTH,
-  NostrClientCLOSE,
-  NostrClientCOUNT,
-  NostrClientEVENT,
-  NostrClientMsg,
-  NostrClientREQ,
-  NostrConnectRequest,
-  NostrConnectResponse,
-  NostrEvent,
-  NostrFilter,
-  NostrMetadata,
-  NostrRelayAUTH,
-  NostrRelayCLOSED,
-  NostrRelayCOUNT,
-  NostrRelayEOSE,
-  NostrRelayEVENT,
-  NostrRelayMsg,
-  NostrRelayNOTICE,
-  NostrRelayOK,
-} from "@nostrify/types";
+import type { NostrFilter } from "@nostrify/types";
 
 /**
  * A suite of [zod](https://github.com/colinhacks/zod) schemas for Nostr.
@@ -36,12 +16,12 @@ import type {
  */
 class NSchema {
   /** Schema to validate Nostr hex IDs such as event IDs and pubkeys. */
-  static id(): z.ZodString {
+  static id() {
     return z.string().regex(/^[0-9a-f]{64}$/);
   }
 
   /** Nostr event schema. */
-  static event(): z.ZodType<NostrEvent> {
+  static event() {
     return z.object({
       id: NSchema.id(),
       kind: z.number().int().nonnegative(),
@@ -58,12 +38,12 @@ class NSchema {
       content: true,
       created_at: true,
       sig: true,
-    }) as z.ZodType<NostrEvent>;
+    });
   }
 
   /** Nostr filter schema. */
-  static filter(): z.ZodType<NostrFilter> {
-    return z.object({
+  static filter() {
+    return z.looseObject({
       kinds: z.number().int().nonnegative().array().optional(),
       ids: NSchema.id().array().optional(),
       authors: NSchema.id().array().optional(),
@@ -72,7 +52,6 @@ class NSchema {
       limit: z.number().int().nonnegative().optional(),
       search: z.string().optional(),
     })
-      .passthrough()
       .transform((value) => {
         const keys = [
           "kinds",
@@ -89,129 +68,116 @@ class NSchema {
           }
           return acc;
         }, {} as Record<string, unknown>) as NostrFilter;
-      }) as z.ZodType<NostrFilter>;
+      });
   }
 
   /**
    * Bech32 string.
    * @see https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki#bech32
    */
-  static bech32<P extends string>(prefix?: P): z.ZodType<`${P}1${string}`> {
+  static bech32<P extends string>(prefix?: P) {
     return z
       .string()
       .regex(/^[\x21-\x7E]{1,83}1[023456789acdefghjklmnpqrstuvwxyz]{6,}$/)
       .refine((value) =>
         prefix ? value.startsWith(`${prefix}1`) : true
-      ) as z.ZodType<`${P}1${string}`>;
+      );
   }
 
   /** WebSocket URL starting with `ws://` or `wss://`. */
-  static relayUrl(): z.ZodType<`ws://${string}` | `wss://${string}`> {
+  static relayUrl() {
     return z
-      .string()
       .url()
-      .regex(/^wss?:\/\//) as z.ZodType<`ws://${string}` | `wss://${string}`>;
+      .regex(/^wss?:\/\//);
   }
 
   /** NIP-01 `EVENT` message from client to relay. */
-  static clientEVENT(): z.ZodType<NostrClientEVENT> {
+  static clientEVENT() {
     return z.tuple([
       z.literal("EVENT"),
       NSchema.event(),
-    ]) as unknown as z.ZodType<
-      NostrClientEVENT
-    >;
+    ]);
   }
 
   /** NIP-01 `REQ` message from client to relay. */
-  static clientREQ(): z.ZodType<NostrClientREQ> {
+  static clientREQ() {
     return z.tuple([z.literal("REQ"), z.string()]).rest(NSchema.filter());
   }
 
   /** NIP-45 `COUNT` message from client to relay. */
-  static clientCOUNT(): z.ZodType<NostrClientCOUNT> {
+  static clientCOUNT() {
     return z.tuple([z.literal("COUNT"), z.string()]).rest(NSchema.filter());
   }
 
   /** NIP-01 `CLOSE` message from client to relay. */
-  static clientCLOSE(): z.ZodType<NostrClientCLOSE> {
-    return z.tuple([z.literal("CLOSE"), z.string()]) as unknown as z.ZodType<
-      NostrClientCLOSE
-    >;
+  static clientCLOSE() {
+    return z.tuple([z.literal("CLOSE"), z.string()]);
   }
 
   /** NIP-42 `AUTH` message from client to relay. */
-  static clientAUTH(): z.ZodType<NostrClientAUTH> {
+  static clientAUTH() {
     return z.tuple([
       z.literal("AUTH"),
       NSchema.event(),
-    ]) as unknown as z.ZodType<
-      NostrClientAUTH
-    >;
+    ]);
   }
 
   /** NIP-01 message from client to relay. */
-  static clientMsg(): z.ZodType<NostrClientMsg> {
+  static clientMsg() {
     return z.union([
       NSchema.clientEVENT(),
       NSchema.clientREQ(),
       NSchema.clientCOUNT(),
       NSchema.clientCLOSE(),
       NSchema.clientAUTH(),
-    ]) as z.ZodType<NostrClientMsg>;
+    ]);
   }
 
   /** NIP-01 `EVENT` message from relay to client. */
-  static relayEVENT(): z.ZodType<NostrRelayEVENT> {
+  static relayEVENT() {
     return z.tuple([
       z.literal("EVENT"),
       z.string(),
       NSchema.event(),
-    ]) as unknown as z.ZodType<NostrRelayEVENT>;
+    ]);
   }
 
   /** NIP-01 `OK` message from relay to client. */
-  static relayOK(): z.ZodType<NostrRelayOK> {
+  static relayOK() {
     return z.tuple([
       z.literal("OK"),
       NSchema.id(),
       z.boolean(),
       z.string(),
-    ]) as unknown as z.ZodType<NostrRelayOK>;
+    ]);
   }
 
   /** NIP-01 `EOSE` message from relay to client. */
-  static relayEOSE(): z.ZodType<NostrRelayEOSE> {
-    return z.tuple([z.literal("EOSE"), z.string()]) as unknown as z.ZodType<
-      NostrRelayEOSE
-    >;
+  static relayEOSE() {
+    return z.tuple([z.literal("EOSE"), z.string()]);
   }
 
   /** NIP-01 `NOTICE` message from relay to client. */
-  static relayNOTICE(): z.ZodType<NostrRelayNOTICE> {
-    return z.tuple([z.literal("NOTICE"), z.string()]) as unknown as z.ZodType<
-      NostrRelayNOTICE
-    >;
+  static relayNOTICE() {
+    return z.tuple([z.literal("NOTICE"), z.string()]);
   }
 
   /** NIP-01 `CLOSED` message from relay to client. */
-  static relayCLOSED(): z.ZodType<NostrRelayCLOSED> {
+  static relayCLOSED() {
     return z.tuple([
       z.literal("CLOSED"),
       z.string(),
       z.string(),
-    ]) as unknown as z.ZodType<NostrRelayCLOSED>;
+    ]);
   }
 
   /** NIP-42 `AUTH` message from relay to client. */
-  static relayAUTH(): z.ZodType<NostrRelayAUTH> {
-    return z.tuple([z.literal("AUTH"), z.string()]) as unknown as z.ZodType<
-      NostrRelayAUTH
-    >;
+  static relayAUTH() {
+    return z.tuple([z.literal("AUTH"), z.string()]);
   }
 
   /** NIP-45 `COUNT` message from relay to client. */
-  static relayCOUNT(): z.ZodType<NostrRelayCOUNT> {
+  static relayCOUNT() {
     return z.tuple([
       z.literal("COUNT"),
       z.string(),
@@ -219,11 +185,11 @@ class NSchema {
         count: z.number().int().nonnegative(),
         approximate: z.boolean().optional(),
       }),
-    ]) as unknown as z.ZodType<NostrRelayCOUNT>;
+    ]);
   }
 
   /** NIP-01 message from relay to client. */
-  static relayMsg(): z.ZodType<NostrRelayMsg> {
+  static relayMsg() {
     return z.union([
       NSchema.relayEVENT(),
       NSchema.relayOK(),
@@ -236,37 +202,37 @@ class NSchema {
   }
 
   /** Kind 0 content schema. */
-  static metadata(): z.ZodType<NostrMetadata> {
-    return z.object({
+  static metadata() {
+    return z.looseObject({
       about: z.string().optional().catch(undefined),
-      banner: z.string().url().optional().catch(undefined),
+      banner: z.url().optional().catch(undefined),
       bot: z.boolean().optional().catch(undefined),
       display_name: z.string().optional().catch(undefined),
       lud06: NSchema.bech32("lnurl").optional().catch(undefined),
-      lud16: z.string().email().optional().catch(undefined),
+      lud16: z.email().optional().catch(undefined),
       name: z.string().optional().catch(undefined),
-      nip05: z.string().email().optional().catch(undefined),
-      picture: z.string().url().optional().catch(undefined),
-      website: z.string().url().optional().catch(undefined),
-    }).passthrough() as z.ZodType<NostrMetadata>;
+      nip05: z.email().optional().catch(undefined),
+      picture: z.url().optional().catch(undefined),
+      website: z.url().optional().catch(undefined),
+    });
   }
 
   /** NIP-46 request content schema. */
-  static connectRequest(): z.ZodType<NostrConnectRequest> {
+  static connectRequest() {
     return z.object({
       id: z.string(),
       method: z.string(),
       params: z.string().array(),
-    }) as z.ZodType<NostrConnectRequest>;
+    });
   }
 
   /** NIP-46 response content schema. */
-  static connectResponse(): z.ZodType<NostrConnectResponse> {
+  static connectResponse() {
     return z.object({
       id: z.string(),
       result: z.string(),
       error: z.string().optional(),
-    }) as z.ZodType<NostrConnectResponse>;
+    });
   }
 
   /**
@@ -276,11 +242,11 @@ class NSchema {
    * const event = NSchema.json().pipe(NSchema.event()).parse(data);
    * ```
    */
-  static json(): z.ZodType<unknown> {
+  static json() {
     return z.string().transform((value, ctx) => {
       try {
         return JSON.parse(value) as unknown;
-      } catch (_e) {
+      } catch {
         ctx.addIssue({ code: z.ZodIssueCode.custom, message: "Invalid JSON" });
         return z.NEVER;
       }