refactor(lib): merge agents.ts and profiles.ts into streams.ts

hasundue · Jun 12, 2023 · c65596f · c65596f
1 parent d06d2d2
commit c65596f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 55 deletions.
diff --git a/docs/EXAMPLES.md b/docs/EXAMPLES.md
@@ -26,14 +26,14 @@ new RelayPool("wss://nos.lol", "wss://relay.nostr.band")
 
 ```ts
 import { Relay } from "../../../client.ts";
-import { EventKind, EventPublisher } from "../../../lib/events.ts";
+import { EventPublisher } from "../../../lib/events.ts";
 import { env } from "../../../lib/env.ts";
 
 const relay = new Relay("wss://nos.lol");
 
 new EventPublisher(relay, env.PRIVATE_KEY)
   .publish({
-    kind: EventKind.TextNote,
+    kind: 1,
     content:
       "Hello, Nostr! This is Lophus, yet another JS/TS library for Nostr!",
   })
@@ -44,16 +44,14 @@ new EventPublisher(relay, env.PRIVATE_KEY)
 
 ```ts
 import { Relay } from "../../../client.ts";
-import { DefaultAgent } from "../../../lib/agents.ts";
+import { Transformer } from "../../../lib/streams.ts";
 import { EventPublisher } from "../../../lib/events.ts";
-import { TextNoteComposer } from "../../../lib/notes.ts";
 import { env } from "../../../lib/env.ts";
 
 const relay = new Relay("wss://nostr-dev.wellorder.net");
 
 relay.subscribe({ kinds: [1], "#p": [env.PUBLIC_KEY] })
-  .pipeThrough(new DefaultAgent((ev) => ({ content: ev.content })))
-  .pipeThrough(new TextNoteComposer())
+  .pipeThrough(new Transformer((ev) => ({ kind: 1, content: ev.content })))
   .pipeTo(new EventPublisher(relay, env.PRIVATE_KEY));
 ```
 

diff --git a/docs/src/examples/echo.ts b/docs/src/examples/echo.ts
@@ -1,13 +1,11 @@
 // Echo bot
 import { Relay } from "../../../client.ts";
-import { DefaultAgent } from "../../../lib/agents.ts";
+import { Transformer } from "../../../lib/streams.ts";
 import { EventPublisher } from "../../../lib/events.ts";
-import { TextNoteComposer } from "../../../lib/notes.ts";
 import { env } from "../../../lib/env.ts";
 
 const relay = new Relay("wss://nostr-dev.wellorder.net");
 
 relay.subscribe({ kinds: [1], "#p": [env.PUBLIC_KEY] })
-  .pipeThrough(new DefaultAgent((ev) => ({ content: ev.content })))
-  .pipeThrough(new TextNoteComposer())
+  .pipeThrough(new Transformer((ev) => ({ kind: 1, content: ev.content })))
   .pipeTo(new EventPublisher(relay, env.PRIVATE_KEY));
diff --git a/docs/src/examples/publish.ts b/docs/src/examples/publish.ts
@@ -1,13 +1,13 @@
 // Publish a text note
 import { Relay } from "../../../client.ts";
-import { EventKind, EventPublisher } from "../../../lib/events.ts";
+import { EventPublisher } from "../../../lib/events.ts";
 import { env } from "../../../lib/env.ts";
 
 const relay = new Relay("wss://nos.lol");
 
 new EventPublisher(relay, env.PRIVATE_KEY)
   .publish({
-    kind: EventKind.TextNote,
+    kind: 1,
     content:
       "Hello, Nostr! This is Lophus, yet another JS/TS library for Nostr!",
   })

diff --git a/lib/agents.ts b/lib/agents.ts
diff --git a/lib/profiles.ts b/lib/profiles.ts
diff --git a/lib/streams.ts b/lib/streams.ts
@@ -3,7 +3,7 @@ export { mergeReadableStreams as merge } from "https://deno.land/[email protected]/str
 /**
  * TransformStream which filters out duplicate values from a stream.
  */
-export class Distinctor<R extends unknown, T extends unknown>
+export class Distinctor<R = unknown, T = unknown>
   extends TransformStream<R, R> {
   #seen: Set<T>;
 
@@ -21,3 +21,17 @@ export class Distinctor<R extends unknown, T extends unknown>
     this.#seen = new Set<T>();
   }
 }
+
+export class Transformer<R = unknown, W = unknown>
+  extends TransformStream<R, W> {
+  constructor(fn: (chunk: R) => W) {
+    super({
+      transform(event, controller) {
+        const result = fn(event);
+        if (result) {
+          controller.enqueue(result);
+        }
+      },
+    });
+  }
+}