Rename request/publish functions

packages/dvm/src/handler.ts

@@ -2,7 +2,7 @@ import {hexToBytes} from "@noble/hashes/utils"
 import {getPublicKey, finalizeEvent} from "nostr-tools/pure"
 import {now} from "@welshman/lib"
 import {TrustedEvent, StampedEvent, Filter} from "@welshman/util"
-import {multireq, multicast, PublishEvent, RequestEvent, AdapterContext} from "@welshman/net"
+import {MultiRequest, MultiPublish, PublishEvent, RequestEvent, AdapterContext} from "@welshman/net"
 
 export type DVMHandler = {
   stop?: () => void
@@ -47,10 +47,10 @@ export class DVM {
           filter["#p"] = [getPublicKey(hexToBytes(sk))]
         }
 
-        const sub = multireq({relays, filter, context})
+        const req = new MultiRequest({relays, filter, context})
 
-        sub.on(RequestEvent.Event, (e: TrustedEvent, url: string) => this.onEvent(e))
-        sub.on(RequestEvent.Close, () => resolve())
+        req.on(RequestEvent.Event, (e: TrustedEvent, url: string) => this.onEvent(e))
+        req.on(RequestEvent.Close, () => resolve())
       })
     }
   }
@@ -113,7 +113,7 @@ export class DVM {
     const event = finalizeEvent(template, hexToBytes(sk))
 
     await new Promise<void>(resolve => {
-      multicast({event, relays, context}).on(PublishEvent.Complete, resolve)
+      new MultiPublish({event, relays, context}).on(PublishEvent.Complete, resolve)
     })
   }
 }

packages/dvm/src/request.ts

@@ -1,6 +1,6 @@
 import {Emitter, now} from "@welshman/lib"
 import {TrustedEvent, SignedEvent, Filter} from "@welshman/util"
-import {multireq, multicast, Multireq, Multicast, RequestEvent, AdapterContext} from "@welshman/net"
+import {MultiRequest, MultiPublish, RequestEvent, AdapterContext} from "@welshman/net"
 
 export enum DVMEvent {
   Progress = "progress",
@@ -19,8 +19,8 @@ export type DVMRequestOptions = {
 export type DVMRequest = {
   request: DVMRequestOptions
   emitter: Emitter
-  sub: Multireq
-  pub: Multicast
+  sub: MultiRequest
+  pub: MultiPublish
 }
 
 export const makeDvmRequest = (request: DVMRequestOptions) => {
@@ -37,8 +37,8 @@ export const makeDvmRequest = (request: DVMRequestOptions) => {
   const kinds = reportProgress ? [kind, 7000] : [kind]
   const filter: Filter = {kinds, since: now() - 60, "#e": [event.id]}
 
-  const sub = multireq({relays, filter, timeout, context})
-  const pub = multicast({relays, event, timeout, context})
+  const sub = new MultiRequest({relays, filter, timeout, context})
+  const pub = new MultiPublish({relays, event, timeout, context})
 
   sub.on(RequestEvent.Event, (event: TrustedEvent, url: string) => {
     if (event.kind === 7000) {