Move subscription to a class

packages/dvm/README.md

@@ -53,7 +53,7 @@ const sub = subscribe({
 })
 
 // Push event ids to our suggestions
-sub.emitter.on('event', (url, e) => tags.push(["e", e.id, url]))
+sub.on('event', (url, e) => tags.push(["e", e.id, url]))
 
 const dvm = new DVM({
   // The private key used to sign events

packages/dvm/src/handler.ts

@@ -49,8 +49,8 @@ export class DVM {
         const filters = [filter]
         const sub = subscribe({relays, filters})
 
-        sub.emitter.on("event", (url: string, e: TrustedEvent) => this.onEvent(e))
-        sub.emitter.on("complete", () => resolve())
+        sub.on("event", (url: string, e: TrustedEvent) => this.onEvent(e))
+        sub.on("complete", () => resolve())
       })
     }
   }

packages/dvm/src/request.ts

@@ -33,7 +33,7 @@ export const makeDvmRequest = (request: DVMRequestOptions) => {
   const sub = subscribe({relays, timeout, filters})
   const pub = publish({event, relays, timeout})
 
-  sub.emitter.on(SubscriptionEvent.Event, (url: string, event: TrustedEvent) => {
+  sub.on(SubscriptionEvent.Event, (url: string, event: TrustedEvent) => {
     if (event.kind === 7000) {
       emitter.emit(DVMEvent.Progress, url, event)
     } else {