refactor(core): stop exporting NIP-01 types from client.ts or relay.ts

Author: hasundue

client.ts

@@ -10,14 +10,12 @@ import type {
   RelayUrl,
   SubscriptionFilter,
   SubscriptionId,
-} from "./core/types.ts";
+} from "./core/nips/01.ts";
 import { NostrNode, NostrNodeConfig } from "./core/nodes.ts";
 import { NonExclusiveWritableStream } from "./core/streams.ts";
 import { LazyWebSocket } from "./core/websockets.ts";
 import { Lock } from "./core/x/async.ts";
 
-export * from "./core/nips/01.ts";
-
 /**
  * A class that represents a remote Nostr Relay.
  */
@@ -152,7 +150,7 @@ export class Relay extends NostrNode<ClientToRelayMessage> {
     if (!accepted) {
       throw new Error(`Event rejected: ${body}`, { cause: event });
     }
-    this.config.logger?.info?.("OK", this.config.name, body);
+    this.config.logger?.debug?.("OK", this.config.name, body);
   }
 
   async close() {

core/nodes.ts

@@ -1,4 +1,5 @@
-import type { Logger, NostrMessage } from "./types.ts";
+import type { NostrMessage } from "./nips/01.ts";
+import type { Logger } from "./types.ts";
 import { WebSocketLike, WebSocketReadyState } from "./websockets.ts";
 import { NonExclusiveWritableStream } from "./streams.ts";
 

core/types.ts

@@ -18,9 +18,6 @@ export type Optional<T, K extends keyof T> = Expand<
   & Partial<Pick<T, K>>
 >;
 
-// NIPs
-export * from "./nips/01.ts";
-
 // Logger
 export interface Logger {
   debug?: (...args: unknown[]) => void;

lib/env.ts

@@ -1,5 +1,5 @@
 import "https://deno.land/std@0.203.0/dotenv/load.ts";
-import { PrivateKey, PublicKey } from "../core/types.ts";
+import { PrivateKey, PublicKey } from "../core/nips/01.ts";
 
 class Env {
   #nsec?: PrivateKey;

lib/events.ts

@@ -5,10 +5,10 @@ import type {
   PrivateKey,
   Stringified,
   Tag,
-} from "../core/types.ts";
+} from "../core/nips/01.ts";
 import type { RelayLike } from "../client.ts";
 
-export { EventKind } from "../core/types.ts";
+export { EventKind } from "../core/nips/01.ts";
 
 export interface EventInit<K extends EventKind = EventKind> {
   kind: K;

lib/notes.ts

@@ -1,4 +1,4 @@
-import { EventKind, NostrEvent, RelayUrl } from "../core/types.ts";
+import { TagName, EventKind, NostrEvent, RelayUrl } from "../core/nips/01.ts";
 import type { Optional } from "../core/types.ts";
 import { EventInit } from "./events.ts";
 
@@ -17,16 +17,16 @@ export class TextNoteComposer extends TransformStream<TextNoteInit, TextNote> {
   compose(
     init: TextNoteInit,
     opts?: {
-      reply_to?: NostrEvent;
-      relay_recommend?: RelayUrl;
+      replyTo?: NostrEvent;
+      relayRecommend?: RelayUrl;
     },
   ): TextNote {
-    const relay_recommend = opts?.relay_recommend ?? this.opts.relay_recommend;
+    const relayRecommend = opts?.relayRecommend ?? this.opts.relay_recommend;
 
     // deno-fmt-ignore
-    const tags = (init.tags ?? []).concat(opts?.reply_to ? [
-      ["e", opts.reply_to.id, relay_recommend ?? ""],
-      ["p", opts.reply_to.pubkey, relay_recommend ?? ""],
+    const tags = (init.tags ?? []).concat(opts?.replyTo ? [
+      ["e" as TagName, opts.replyTo.id, relayRecommend ?? ""],
+      ["p" as TagName, opts.replyTo.pubkey, relayRecommend ?? ""],
     ] : []);
 
     return { ...init, kind: EventKind.TextNote, tags };

lib/pools.ts

@@ -2,12 +2,12 @@ import type {
   ClientToRelayMessage,
   EventKind,
   SubscriptionFilter,
-} from "../core/types.ts";
+  RelayUrl,
+} from "../core/nips/01.ts";
 import {
   Relay,
   RelayInit,
   RelayLike,
-  RelayUrl,
   SubscriptionOptions,
 } from "../client.ts";
 import { NonExclusiveWritableStream } from "../core/streams.ts";

lib/signs.ts

@@ -1,13 +1,13 @@
+import type { Brand } from "../core/types.ts";
 import type {
-  Brand,
   EventContent,
   EventId,
   EventKind,
   EventSerializePrecursor,
   NostrEvent,
   Signature,
   Stringified,
-} from "../core/types.ts";
+} from "../core/nips/01.ts";
 import type { EventInit } from "./events.ts";
 import { Timestamp } from "./times.ts";
 import { bytesToHex, schnorr, sha256 } from "./x/noble.ts";

relay.ts

@@ -3,12 +3,10 @@ import type {
   NostrEvent,
   RelayToClientMessage,
   SubscriptionFilter,
-} from "./core/types.ts";
-import { SubscriptionId } from "./core/types.ts";
+  SubscriptionId,
+} from "./core/nips/01.ts";
 import { NostrNode, NostrNodeConfig } from "./core/nodes.ts";
 
-export * from "./core/types.ts";
-
 /**
  * A class that represents a remote Nostr client.
  */

tests/client_test.ts

@@ -1,4 +1,5 @@
-import { NostrEvent, Relay } from "../client.ts";
+import { NostrEvent } from "../core/nips/01.ts";
+import { Relay } from "../client.ts";
 import { afterAll, beforeAll, describe, it } from "../lib/std/testing.ts";
 import { assert, assertEquals, assertObjectMatch } from "../lib/std/assert.ts";
 import { MockWebSocket } from "../lib/testing.ts";

tests/relay_test.ts

@@ -1,9 +1,5 @@
-import {
-  Client,
-  NostrEvent,
-  RelayToClientMessage,
-  SubscriptionId,
-} from "../relay.ts";
+import { EventMessage, NostrEvent, SubscriptionId } from "../core/nips/01.ts";
+import { Client } from "../relay.ts";
 import { afterAll, beforeAll, describe, it } from "../lib/std/testing.ts";
 import { assert, assertEquals } from "../lib/std/assert.ts";
 import { MockWebSocket } from "../lib/testing.ts";
@@ -73,7 +69,7 @@ describe("Client", () => {
     });
     it("should be able to deliver an event to a subscription", async () => {
       const msg = { kind: 0 };
-      const received = new Promise<RelayToClientMessage>((resolve) => {
+      const received = new Promise<EventMessage>((resolve) => {
         ws.remote.addEventListener("message", (ev: MessageEvent<string>) => {
           resolve(JSON.parse(ev.data));
         });