rework context

2024-09-05 13:38:48 -07:00
parent 233a4e3576
commit 44f29c9da4
19 changed files with 157 additions and 138 deletions
@@ -1,45 +1,40 @@
-import {uniq} from '@welshman/lib'
+import {ctx, uniq, noop, always} from '@welshman/lib'
 import {matchFilters, unionFilters, isSignedEvent, hasValidSignature} from '@welshman/util'
 import type {Filter, TrustedEvent} from '@welshman/util'
 import {Pool} from "./Pool"
 import {Executor} from "./Executor"
 import {Relays} from "./target/Relays"
-import type {Subscription} from "./Subscribe"
+import type {Subscription, RelaysAndFilters} from "./Subscribe"

-export const defaultPool = new Pool()
-
-export const defaultGetExecutor = (relays: string[]) =>
-  new Executor(new Relays(relays.map((relay: string) => NetworkContext.pool.get(relay))))
-
-const defaultOnEvent = (url: string, event: TrustedEvent) => null
-
-const defaultOnAuth = (url: string, challenge: string) => null
-
-const defaultOnOk = (url: string, id: string, ok: boolean, message: string) => null
-
-const defaultIsDeleted = (url: string, event: TrustedEvent) => false
-
-const defaultHasValidSignature = (url: string, event: TrustedEvent) => isSignedEvent(event) && hasValidSignature(event)
-
-const defaultMatchFilters = (url: string, filters: Filter[], event: TrustedEvent) => matchFilters(filters, event)
-
-export function* defaultOptimizeSubscriptions(subs: Subscription[]) {
-  for (const relay of uniq(subs.flatMap(sub => sub.request.relays || []))) {
-    const relaySubs = subs.filter(sub => sub.request.relays.includes(relay))
-    const filters = unionFilters(relaySubs.flatMap(sub => sub.request.filters))
-
-    yield {relays: [relay], filters}
-  }
+export type NetContext = {
+  pool: Pool
+  getExecutor: (relays: string[]) => Executor
+  onEvent: (url: string, event: TrustedEvent) => void
+  onAuth: (url: string, challenge: string) => void
+  onOk: (url: string, id: string, ok: boolean, message: string) => void
+  isDeleted: (url: string, event: TrustedEvent) => boolean
+  hasValidSignature: (url: string, event: TrustedEvent) => boolean
+  matchFilters: (url: string, filters: Filter[], event: TrustedEvent) => boolean
+  optimizeSubscriptions: (subs: Subscription[]) => RelaysAndFilters[]
 }

-export const NetworkContext = {
-  pool: defaultPool,
-  getExecutor: defaultGetExecutor,
-  onEvent: defaultOnEvent,
-  onAuth: defaultOnAuth,
-  onOk: defaultOnOk,
-  isDeleted: defaultIsDeleted,
-  hasValidSignature: defaultHasValidSignature,
-  matchFilters: defaultMatchFilters,
+export const defaultOptimizeSubscriptions = (subs: Subscription[]) =>
+  uniq(subs.flatMap(sub => sub.request.relays || []))
+    .map(relay => {
+      const relaySubs = subs.filter(sub => sub.request.relays.includes(relay))
+      const filters = unionFilters(relaySubs.flatMap(sub => sub.request.filters))
+
+      return {relays: [relay], filters}
+    })
+
+export const getDefaultNetContext = () => ({
+  onOk: noop,
+  onAuth: noop,
+  onEvent: noop,
+  pool: new Pool(),
+  isDeleted: always(false),
+  getExecutor: (relays: string[]) => new Executor(new Relays(relays.map((relay: string) => ctx.net.pool.get(relay)))),
+  hasValidSignature: (url: string, event: TrustedEvent) => isSignedEvent(event) && hasValidSignature(event),
+  matchFilters: (url: string, filters: Filter[], event: TrustedEvent) => matchFilters(filters, event),
  optimizeSubscriptions: defaultOptimizeSubscriptions,
-}
+})