@welshman/net 0.1.2 → 0.2.0

package/dist/net/src/publish.js

@@ -1,125 +1,96 @@
-import { EventEmitter } from "events";
-import { on, fromPairs, sleep, yieldThread } from "@welshman/lib";
 import { ClientMessageType, isRelayOk } from "./message.js";
 import { AdapterEvent, getAdapter } from "./adapter.js";
 export var PublishStatus;
 (function (PublishStatus) {
+    PublishStatus["Sending"] = "publish:status:sending";
     PublishStatus["Pending"] = "publish:status:pending";
     PublishStatus["Success"] = "publish:status:success";
     PublishStatus["Failure"] = "publish:status:failure";
     PublishStatus["Timeout"] = "publish:status:timeout";
     PublishStatus["Aborted"] = "publish:status:aborted";
 })(PublishStatus || (PublishStatus = {}));
-export var PublishEvent;
-(function (PublishEvent) {
-    PublishEvent["Success"] = "publish:event:success";
-    PublishEvent["Failure"] = "publish:event:failure";
-    PublishEvent["Timeout"] = "publish:event:timeout";
-    PublishEvent["Aborted"] = "publish:event:aborted";
-    PublishEvent["Complete"] = "publish:event:complete";
-})(PublishEvent || (PublishEvent = {}));
-export class SinglePublish extends EventEmitter {
-    options;
-    status = PublishStatus.Pending;
-    _unsubscriber;
-    _adapter;
-    constructor(options) {
-        super();
-        this.options = options;
-        // Set up our adapter
-        this._adapter = getAdapter(this.options.relay, this.options.context);
-        // Listen for SinglePublish result
-        this._unsubscriber = on(this._adapter, AdapterEvent.Receive, (message, url) => {
-            if (isRelayOk(message)) {
-                const [_, id, ok, detail] = message;
-                if (id !== this.options.event.id)
-                    return;
-                if (ok) {
-                    this.status = PublishStatus.Success;
-                    this.emit(PublishEvent.Success, id, detail);
-                }
-                else {
-                    this.status = PublishStatus.Failure;
-                    this.emit(PublishEvent.Failure, id, detail);
-                }
-                this.cleanup();
+export const publishOne = (options) => new Promise(resolve => {
+    const adapter = getAdapter(options.relay, options.context);
+    let status = PublishStatus.Pending;
+    options.onPending?.();
+    const cleanup = () => {
+        options.onComplete?.();
+        adapter.cleanup();
+        resolve(status);
+    };
+    adapter.on(AdapterEvent.Receive, (message, url) => {
+        if (isRelayOk(message)) {
+            const [_, id, ok, detail] = message;
+            if (id !== options.event.id)
+                return;
+            if (ok) {
+                status = PublishStatus.Success;
+                options.onSuccess?.(detail);
             }
-        });
-        // Set timeout
-        sleep(this.options.timeout || 10_000).then(() => {
-            if (this.status === PublishStatus.Pending) {
-                this.status = PublishStatus.Timeout;
-                this.emit(PublishEvent.Timeout);
+            else {
+                status = PublishStatus.Failure;
+                options.onFailure?.(detail);
             }
-            this.cleanup();
-        });
-        // Start asynchronously so the caller can set up listeners
-        yieldThread().then(() => {
-            this._adapter.send([ClientMessageType.Event, this.options.event]);
-        });
-    }
-    abort = () => {
-        if (this.status === PublishStatus.Pending) {
-            this.status = PublishStatus.Aborted;
-            this.emit(PublishEvent.Aborted);
-            this.cleanup();
-        }
-    };
-    cleanup = () => {
-        this.emit(PublishEvent.Complete);
-        this.removeAllListeners();
-        this._adapter.cleanup();
-        this._unsubscriber();
-    };
-}
-export class MultiPublish extends EventEmitter {
-    status;
-    _children = [];
-    _completed = new Set();
-    constructor(options) {
-        super();
-        const relays = new Set(options.relays);
-        if (relays.size !== options.relays.length) {
-            console.warn("Non-unique relays passed to MultiPublish");
+            cleanup();
         }
-        this.status = fromPairs(Array.from(relays).map(relay => [relay, PublishStatus.Pending]));
-        for (const relay of relays) {
-            const unicast = new SinglePublish({ relay, ...options });
-            unicast.on(PublishEvent.Success, (id, detail) => {
-                this.status[relay] = unicast.status;
-                this.emit(PublishEvent.Success, id, detail, relay);
-            });
-            unicast.on(PublishEvent.Failure, (id, detail) => {
-                this.status[relay] = unicast.status;
-                this.emit(PublishEvent.Failure, id, detail, relay);
-            });
-            unicast.on(PublishEvent.Timeout, () => {
-                this.status[relay] = unicast.status;
-                this.emit(PublishEvent.Timeout, relay);
-            });
-            unicast.on(PublishEvent.Aborted, () => {
-                this.status[relay] = unicast.status;
-                this.emit(PublishEvent.Aborted, relay);
-            });
-            unicast.on(PublishEvent.Complete, () => {
-                this._completed.add(relay);
-                this.status[relay] = unicast.status;
-                if (this._completed.size === relays.size) {
-                    this.emit(PublishEvent.Complete);
-                    this.cleanup();
-                }
-            });
-            this._children.push(unicast);
+    });
+    options.signal?.addEventListener("abort", () => {
+        if (status === PublishStatus.Pending) {
+            status = PublishStatus.Aborted;
+            options.onAborted?.();
         }
-    }
-    abort() {
-        for (const child of this._children) {
-            child.abort();
+        cleanup();
+    });
+    setTimeout(() => {
+        if (status === PublishStatus.Pending) {
+            status = PublishStatus.Timeout;
+            options.onTimeout?.();
         }
+        cleanup();
+    }, options.timeout || 10_000);
+    adapter.send([ClientMessageType.Event, options.event]);
+});
+export const publish = async (options) => {
+    const { event, timeout, signal, context } = options;
+    const status = {};
+    const completed = new Set();
+    const relays = new Set(options.relays);
+    if (relays.size !== options.relays.length) {
+        console.warn("Non-unique relays passed to publish");
     }
-    cleanup() {
-        this.removeAllListeners();
-    }
-}
-export const publish = (options) => new MultiPublish(options);
+    await Promise.all(options.relays.map(relay => publishOne({
+        event,
+        relay,
+        signal,
+        timeout,
+        context,
+        onSuccess: (detail) => {
+            status[relay] = PublishStatus.Success;
+            options.onSuccess?.(detail, relay);
+        },
+        onFailure: (detail) => {
+            status[relay] = PublishStatus.Failure;
+            options.onFailure?.(detail, relay);
+        },
+        onPending: () => {
+            status[relay] = PublishStatus.Pending;
+            options.onPending?.(relay);
+        },
+        onTimeout: () => {
+            status[relay] = PublishStatus.Timeout;
+            options.onTimeout?.(relay);
+        },
+        onAborted: () => {
+            status[relay] = PublishStatus.Aborted;
+            options.onAborted?.(relay);
+        },
+        onComplete: () => {
+            completed.add(relay);
+            if (completed.size === relays.size) {
+                options.onComplete?.();
+            }
+        },
+    })));
+    return status;
+};
 //# sourceMappingURL=publish.js.map

package/dist/net/src/publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../src/publish.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../src/publish.ts"],"names":[],"mappings":"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"}

package/dist/net/src/request.d.ts

@@ -1,70 +1,31 @@
-import { EventEmitter } from "events";
+import { Deferred } from "@welshman/lib";
 import { Filter, TrustedEvent } from "@welshman/util";
-import { AdapterContext, AbstractAdapter } from "./adapter.js";
-import { Unsubscriber } from "./util.js";
+import { AdapterContext } from "./adapter.js";
 import { Tracker } from "./tracker.js";
-export declare enum RequestEvent {
-    Close = "request:event:close",
-    Disconnect = "request:event:disconnect",
-    Duplicate = "request:event:duplicate",
-    Eose = "request:event:eose",
-    Event = "request:event:event",
-    Filtered = "request:event:filtered",
-    Deleted = "request:event:deleted",
-    Invalid = "request:event:invalid"
-}
-export type SingleRequestEvents = {
-    [RequestEvent.Event]: (event: TrustedEvent) => void;
-    [RequestEvent.Deleted]: (event: any) => void;
-    [RequestEvent.Invalid]: (event: any) => void;
-    [RequestEvent.Filtered]: (event: TrustedEvent) => void;
-    [RequestEvent.Duplicate]: (event: TrustedEvent) => void;
-    [RequestEvent.Disconnect]: () => void;
-    [RequestEvent.Close]: () => void;
-    [RequestEvent.Eose]: () => void;
-};
-export type SingleRequestOptions = {
+export type RequestOneOptions = {
     relay: string;
     filters: Filter[];
     signal?: AbortSignal;
-    context?: AdapterContext;
-    timeout?: number;
     tracker?: Tracker;
+    context?: AdapterContext;
     autoClose?: boolean;
     isEventValid?: (event: TrustedEvent, url: string) => boolean;
     isEventDeleted?: (event: TrustedEvent, url: string) => boolean;
+    onEvent?: (event: TrustedEvent, url: string) => void;
+    onDeleted?: (event: unknown, url: string) => void;
+    onInvalid?: (event: unknown, url: string) => void;
+    onFiltered?: (event: TrustedEvent, url: string) => void;
+    onDuplicate?: (event: TrustedEvent, url: string) => void;
+    onDisconnect?: (url: string) => void;
+    onEose?: (url: string) => void;
+    onClose?: () => void;
 };
-export declare class SingleRequest extends EventEmitter {
-    readonly options: SingleRequestOptions;
-    _ids: Set<string>;
-    _eose: Set<string>;
-    _unsubscribers: Unsubscriber[];
-    _adapter: AbstractAdapter;
-    _closed: boolean;
-    constructor(options: SingleRequestOptions);
-    close(): void;
-}
-export type MultiRequestEvents = {
-    [RequestEvent.Event]: (event: TrustedEvent, url: string) => void;
-    [RequestEvent.Deleted]: (event: TrustedEvent, url: string) => void;
-    [RequestEvent.Invalid]: (event: TrustedEvent, url: string) => void;
-    [RequestEvent.Filtered]: (event: TrustedEvent, url: string) => void;
-    [RequestEvent.Duplicate]: (event: TrustedEvent, url: string) => void;
-    [RequestEvent.Disconnect]: (url: string) => void;
-    [RequestEvent.Eose]: (url: string) => void;
-    [RequestEvent.Close]: () => void;
-};
-export type MultiRequestOptions = Omit<SingleRequestOptions, "relay"> & {
+export declare const requestOne: (options: RequestOneOptions) => Deferred<TrustedEvent[], TrustedEvent[]>;
+export type RequestOptions = Omit<RequestOneOptions, "relay"> & {
     relays: string[];
     threshold?: number;
 };
-export declare class MultiRequest extends EventEmitter {
-    _children: SingleRequest[];
-    _closed: Set<string>;
-    constructor(options: MultiRequestOptions);
-    close(): void;
-}
-export declare const request: (options: MultiRequestOptions) => MultiRequest;
+export declare const request: (options: RequestOptions) => Promise<TrustedEvent[]>;
 export type LoaderOptions = {
     delay: number;
     timeout?: number;
@@ -76,14 +37,19 @@ export type LoaderOptions = {
 export type LoadOptions = {
     relays: string[];
     filters: Filter[];
+    signal?: AbortSignal;
+    onEvent?: (event: TrustedEvent, url: string) => void;
+    onDisconnect?: (url: string) => void;
+    onEose?: (url: string) => void;
+    onClose?: () => void;
 };
 /**
  * Creates a convenience function which returns a promise of events from a request.
- * It may return early if filter cardinality is known, and it delays requests by
- * 200 in order to implement batching
- * @param options - MultiRequestOptions
- * @returns - a promise containing an array of TrustedEvents
+ * It may return early if filter cardinality is known, and it delays requests in order
+ * to implement batching
+ * @param options - LoaderOptions
+ * @returns - a load function
  */
-export declare const makeLoader: (options: LoaderOptions) => (request: LoadOptions) => Promise<TrustedEvent[]>;
-export declare const load: (request: LoadOptions) => Promise<TrustedEvent[]>;
+export declare const makeLoader: (options: LoaderOptions) => (request: LoadOptions) => Promise<Deferred<TrustedEvent[]>>;
+export declare const load: (request: LoadOptions) => Promise<Deferred<TrustedEvent[]>>;
 //# sourceMappingURL=request.d.ts.map

package/dist/net/src/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAA;AAEnC,OAAO,EACL,MAAM,EAGN,YAAY,EAEb,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAa,cAAc,EAAE,eAAe,EAAe,MAAM,cAAc,CAAA;AAEtF,OAAO,EAAC,YAAY,EAAC,MAAM,WAAW,CAAA;AAEtC,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AAEpC,oBAAY,YAAY;IACtB,KAAK,wBAAwB;IAC7B,UAAU,6BAA6B;IACvC,SAAS,4BAA4B;IACrC,IAAI,uBAAuB;IAC3B,KAAK,wBAAwB;IAC7B,QAAQ,2BAA2B;IACnC,OAAO,0BAA0B;IACjC,OAAO,0BAA0B;CAClC;AAID,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACnD,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAA;IAC5C,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAA;IAC5C,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACtD,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACvD,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,IAAI,CAAA;IACrC,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;IAChC,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;IAC5D,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;CAC/D,CAAA;AAED,qBAAa,aAAc,SAAQ,YAAY;IAOjC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IANlD,IAAI,cAAoB;IACxB,KAAK,cAAoB;IACzB,cAAc,EAAE,YAAY,EAAE,CAAK;IACnC,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,UAAQ;gBAEM,OAAO,EAAE,oBAAoB;IAmFlD,KAAK;CAaN;AAID,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAChE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAClE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAClE,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACnE,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACpE,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAChD,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC1C,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,GAAG;IACtE,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,qBAAa,YAAa,SAAQ,YAAY;IAC5C,SAAS,EAAE,aAAa,EAAE,CAAK;IAC/B,OAAO,cAAoB;gBAEf,OAAO,EAAE,mBAAmB;IAuDxC,KAAK;CAKN;AAED,eAAO,MAAM,OAAO,GAAI,SAAS,mBAAmB,iBAA8B,CAAA;AAElF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;IAC5D,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;CAC/D,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,aAAa,sDA8C7C,CAAA;AAEJ,eAAO,MAAM,IAAI,mDAA0D,CAAA"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/request.ts"],"names":[],"mappings":"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"}