Add diff utils, change how adapter is created, scope down subscribe/publish to a single relay for fastest possible completion

packages/net2/src/publish.ts

@@ -2,7 +2,7 @@ import {EventEmitter} from "events"
 import {on, sleep, yieldThread} from "@welshman/lib"
 import {SignedEvent} from "@welshman/util"
 import {RelayMessage, ClientMessageType, isRelayOk} from "./message.js"
-import {AbstractAdapter, AdapterEventType} from "./adapter.js"
+import {AbstractAdapter, AdapterEventType, AdapterContext, getAdapter} from "./adapter.js"
 import {TypedEmitter} from "./util.js"
 
 export enum PublishStatus {
@@ -13,33 +13,42 @@ export enum PublishStatus {
   Aborted = "publish:status:aborted",
 }
 
+export enum PublishEventType {
+  Complete = "publish:status:complete",
+}
+
 export type PublishEvents = {
-  [PublishStatus.Pending]: (url: string) => void
   [PublishStatus.Success]: (id: string, detail: string, url: string) => void
   [PublishStatus.Failure]: (id: string, detail: string, url: string) => void
-  [PublishStatus.Timeout]: (url: string) => void
-  [PublishStatus.Aborted]: (url: string) => void
+  [PublishStatus.Timeout]: () => void
+  [PublishStatus.Aborted]: () => void
+  [PublishEventType.Complete]: () => void
 }
 
 export type PublishOptions = {
-  adapter: AbstractAdapter
+  relay: string
   event: SignedEvent
+  context: AdapterContext
   timeout?: number
   on?: Partial<PublishEvents>
 }
 
 export class Publish extends (EventEmitter as new () => TypedEmitter<PublishEvents>) {
-  status = new Map<string, PublishStatus>()
+  status = PublishStatus.Pending
 
   _done = new Set<string>()
   _unsubscriber: () => void
+  _adapter: AbstractAdapter
 
   constructor(readonly options: PublishOptions) {
     super()
 
+    // Set up our adapter
+    this._adapter = getAdapter(this.options.relay, this.options.context)
+
     // Listen for publish result
     this._unsubscriber = on(
-      this.options.adapter,
+      this._adapter,
       AdapterEventType.Receive,
       (message: RelayMessage, url: string) => {
         if (isRelayOk(message)) {
@@ -48,16 +57,14 @@ export class Publish extends (EventEmitter as new () => TypedEmitter<PublishEven
           if (id !== this.options.event.id) return
 
           if (ok) {
-            this.status.set(url, PublishStatus.Success)
+            this.status = PublishStatus.Success
             this.emit(PublishStatus.Success, id, detail, url)
           } else {
-            this.status.set(url, PublishStatus.Failure)
+            this.status = PublishStatus.Failure
             this.emit(PublishStatus.Failure, id, detail, url)
           }
 
-          if (!Array.from(this.status.values()).includes(PublishStatus.Pending)) {
-            this.cleanup()
-          }
+          this.cleanup()
         }
       },
     )
@@ -74,42 +81,34 @@ export class Publish extends (EventEmitter as new () => TypedEmitter<PublishEven
   }
 
   start = () => {
-    // Initialize status
-    for (const url of this.options.adapter.urls) {
-      this.status.set(url, PublishStatus.Pending)
-      this.emit(PublishStatus.Pending, url)
-    }
-
     // Set timeout
     sleep(this.options.timeout || 10_000).then(() => {
-      for (const [url, status] of this.status.entries()) {
-        if (status === PublishStatus.Pending) {
-          this.status.set(url, PublishStatus.Timeout)
-          this.emit(PublishStatus.Timeout, url)
-        }
+      if (this.status === PublishStatus.Pending) {
+        this.status = PublishStatus.Timeout
+        this.emit(PublishStatus.Timeout)
       }
 
       this.cleanup()
     })
 
     // Send the publish message
-    this.options.adapter.send([ClientMessageType.Event, event])
+    this._adapter.send([ClientMessageType.Event, event])
   }
 
   abort = () => {
-    for (const [url, status] of this.status.entries()) {
-      if (status === PublishStatus.Pending) {
-        this.status.set(url, PublishStatus.Aborted)
-        this.emit(PublishStatus.Aborted, url)
-      }
+    if (this.status === PublishStatus.Pending) {
+      this.status = PublishStatus.Aborted
+      this.emit(PublishStatus.Aborted)
+      this.cleanup()
     }
-
-    this.cleanup()
   }
 
   cleanup = () => {
-    this.options.adapter.cleanup()
+    this.emit(PublishEventType.Complete)
     this.removeAllListeners()
+    this._adapter.cleanup()
     this._unsubscriber()
   }
 }
+
+export const publish = (options: PublishOptions) => new Publish(options)