Refactor dvm request and outbox loader

packages/app/src/feeds.ts

@@ -2,7 +2,7 @@ import {nthEq, partition, race, now} from "@welshman/lib"
 import {createEvent, getPubkeyTagValues, TrustedEvent} from "@welshman/util"
 import {request, Tracker} from "@welshman/net"
 import {Scope, FeedController, RequestOpts, FeedOptions, DVMOpts, Feed} from "@welshman/feeds"
-import {makeDvmRequest, DVMEvent} from "@welshman/dvm"
+import {makeDvmRequest} from "@welshman/dvm"
 import {makeSecret, Nip01Signer} from "@welshman/signer"
 import {pubkey, signer} from "./session.js"
 import {Router, addMinimalFallbacks, getFilterSelections} from "./router.js"
@@ -91,14 +91,10 @@ export const requestDVM = async ({kind, onEvent, ...request}: DVMOpts) => {
     tags.push(["param", "max_results", "200"])
   }
 
-  const event = await $signer.sign(createEvent(kind, {tags}))
-  const req = makeDvmRequest({event, relays})
-
-  await new Promise<void>(resolve => {
-    req.emitter.on(DVMEvent.Result, (url, event) => {
-      onEvent(event)
-      resolve()
-    })
+  await makeDvmRequest({
+    relays,
+    event: await $signer.sign(createEvent(kind, {tags})),
+    onResult: onEvent,
   })
 }
 

packages/app/src/follows.ts

@@ -19,5 +19,5 @@ export const {
   name: "follows",
   store: follows,
   getKey: follows => follows.event.pubkey,
-  load: makeOutboxLoader([FOLLOWS])
+  load: makeOutboxLoader(FOLLOWS)
 })

packages/app/src/mutes.ts

@@ -25,5 +25,5 @@ export const {
   name: "mutes",
   store: mutes,
   getKey: mute => mute.event.pubkey,
-  load: makeOutboxLoader([MUTES])
+  load: makeOutboxLoader(MUTES)
 })

packages/app/src/pins.ts

@@ -19,5 +19,5 @@ export const {
   name: "pins",
   store: pins,
   getKey: pins => pins.event.pubkey,
-  load: makeOutboxLoader([PINS])
+  load: makeOutboxLoader(PINS)
 })

packages/app/src/profiles.ts

@@ -22,7 +22,7 @@ export const {
   name: "profiles",
   store: profiles,
   getKey: profile => profile.event.pubkey,
-  load: makeOutboxLoader([PROFILE]),
+  load: makeOutboxLoader(PROFILE),
 })
 
 export const displayProfileByPubkey = (pubkey: string | undefined) =>

packages/app/src/relaySelections.ts

@@ -37,28 +37,30 @@ export const getWriteRelayUrls = (list?: List): string[] =>
 export type OutboxLoaderRequest = {
   pubkey: string
   relays: string[]
+  kind: number
 }
 
-export const makeOutboxLoader = (kinds: number[]) => {
-  const loadOutboxRequest = batcher(200, (requests: OutboxLoaderRequest[]) => {
-    const router = Router.get()
-    const authors: string[] = []
-    const scenarios = [router.Index()]
+export const loadUsingOutbox = batcher(200, (requests: OutboxLoaderRequest[]) => {
+  const router = Router.get()
+  const authors: string[] = []
+  const scenarios = [router.Index()]
+  const kinds = new Set<number>()
 
-    for (const {pubkey, relays} of requests) {
-      authors.push(pubkey)
-      scenarios.push(router.FromPubkey(pubkey), router.FromRelays(relays))
-    }
+  for (const {pubkey, relays, kind} of requests) {
+    kinds.add(kind)
+    authors.push(pubkey)
+    scenarios.push(router.FromPubkey(pubkey), router.FromRelays(relays))
+  }
 
-    const filters = [{authors, kinds}]
-    const relays = router.merge(scenarios).getUrls()
-    const promise = request({filters, relays, autoClose: true})
+  const relays = router.merge(scenarios).getUrls()
+  const filters = [{authors, kinds: Array.from(kinds)}]
+  const promise = request({filters, relays, autoClose: true})
 
-    return requests.map(always(promise))
-  })
+  return requests.map(always(promise))
+})
 
-  return (pubkey: string, relays: string[]) => loadOutboxRequest({pubkey, relays})
-}
+export const makeOutboxLoader = (kind: number) =>
+  (pubkey: string, relays: string[]) => loadUsingOutbox({pubkey, relays, kind})
 
 export const relaySelections = deriveEventsMapped<PublishedList>(repository, {
   filters: [{kinds: [RELAYS]}],
@@ -74,7 +76,7 @@ export const {
   name: "relaySelections",
   store: relaySelections,
   getKey: relaySelections => relaySelections.event.pubkey,
-  load: makeOutboxLoader([RELAYS]),
+  load: makeOutboxLoader(RELAYS),
 })
 
 export const inboxRelaySelections = deriveEventsMapped<PublishedList>(repository, {
@@ -91,5 +93,5 @@ export const {
   name: "inboxRelaySelections",
   store: inboxRelaySelections,
   getKey: inboxRelaySelections => inboxRelaySelections.event.pubkey,
-  load: makeOutboxLoader([INBOX_RELAYS]),
+  load: makeOutboxLoader(INBOX_RELAYS),
 })

packages/dvm/src/request.ts

@@ -2,51 +2,42 @@ import {Emitter, now} from "@welshman/lib"
 import {TrustedEvent, SignedEvent, Filter} from "@welshman/util"
 import {request, publish, AdapterContext} from "@welshman/net"
 
-export enum DVMEvent {
-  Progress = "progress",
-  Result = "result",
-}
-
 export type DVMRequestOptions = {
   event: SignedEvent
   relays: string[]
   timeout?: number
   autoClose?: boolean
-  reportProgress?: boolean
   context?: AdapterContext
+  onResult?: (event: TrustedEvent, url: string) => void
+  onProgress?: (event: TrustedEvent, url: string) => void
 }
 
-export type DVMRequest = {
-  options: DVMRequestOptions
-  emitter: Emitter
-}
-
-export const makeDvmRequest = (options: DVMRequestOptions) => {
-  const emitter = new Emitter()
+export const requestDvmResponse = (options: DVMRequestOptions) => {
   const {
     event,
     relays,
     context,
     timeout = 30_000,
     autoClose = true,
-    reportProgress = true,
+    onResult,
+    onProgress,
   } = options
   const kind = event.kind + 1000
-  const kinds = reportProgress ? [kind, 7000] : [kind]
+  const kinds = onProgress ? [kind, 7000] : [kind]
   const filters: Filter[] = [{kinds, since: now() - 60, "#e": [event.id]}]
   const abortController = new AbortController()
   const signal = AbortSignal.any([abortController.signal, AbortSignal.timeout(timeout)])
 
-  request({
+  return request({
     signal,
     relays,
     filters,
     context,
     onEvent: (event: TrustedEvent, url: string) => {
       if (event.kind === 7000) {
-        emitter.emit(DVMEvent.Progress, url, event)
+        onProgress?.(event, url)
       } else {
-        emitter.emit(DVMEvent.Result, url, event)
+        onResult?.(event, url)
 
         if (autoClose) {
           abortController.abort()
@@ -54,9 +45,7 @@ export const makeDvmRequest = (options: DVMRequestOptions) => {
       }
     },
   })
-
-  publish({relays, event, timeout, context})
-
-
-  return {options, emitter} as DVMRequest
 }
+
+export const makeDvmRequest = (options: DVMRequestOptions) =>
+  Promise.all([publish(options), requestDvmResponse(options)])

packages/net/src/request.ts

@@ -297,7 +297,7 @@ export const makeLoader = (options: LoaderOptions) =>
       }
     )
 
-    return allRequests.map(r => resultsByRequest.get(r))
+    return allRequests.map(r => resultsByRequest.get(r)!)
   })
 
 export const load = makeLoader({delay: 200, timeout: 3000, threshold: 0.5})