@welshman/net 0.0.20 → 0.0.21

package/build/src/Subscribe.cjs

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.subscribe = exports.executeSubscriptionBatched = exports.executeSubscriptions = exports.executeSubscription = exports.mergeSubscriptions = exports.calculateSubscriptionGroup = exports.makeSubscription = exports.SubscriptionEvent = void 0;
+exports.subscribe = exports.executeSubscriptionBatched = exports.executeSubscriptions = exports.executeSubscription = exports.optimizeSubscriptions = exports.mergeSubscriptions = exports.calculateSubscriptionGroup = exports.makeSubscription = exports.SubscriptionEvent = void 0;
 const lib_1 = require("@welshman/lib");
 const util_1 = require("@welshman/util");
 const Tracker_1 = require("./Tracker.cjs");
-const Context_1 = require("./Context.cjs");
 // `subscribe` is a super function that handles batching subscriptions by merging
 // them based on parameters (filters and subscribe opts), then splits them by relay.
 // This results in fewer REQs being opened per connection, fewer duplicate events
 // being downloaded, and therefore less signature validation.
 //
-// Behavior can be further configured using NetworkContext. This can be useful for
+// Behavior can be further configured using ctx.net. This can be useful for
 // adding support for querying a local cache like a relay, tracking deleted events,
 // and bypassing validation for trusted relays.
 //
@@ -27,7 +26,7 @@ var SubscriptionEvent;
     SubscriptionEvent["Duplicate"] = "duplicate";
     SubscriptionEvent["DeletedEvent"] = "deleted-event";
     SubscriptionEvent["FailedFilter"] = "failed-filter";
-    SubscriptionEvent["InvalidSignature"] = "invalid-signature";
+    SubscriptionEvent["Invalid"] = "invalid";
 })(SubscriptionEvent || (exports.SubscriptionEvent = SubscriptionEvent = {}));
 const makeSubscription = (request) => {
     const id = (0, lib_1.randomId)();
@@ -43,31 +42,78 @@ const calculateSubscriptionGroup = (sub) => {
     const parts = [];
     if (sub.request.timeout)
         parts.push(`timeout:${sub.request.timeout}`);
+    if (sub.request.authTimeout)
+        parts.push(`authTimeout:${sub.request.authTimeout}`);
     if (sub.request.closeOnEose)
         parts.push('closeOnEose');
     return parts.join('|');
 };
 exports.calculateSubscriptionGroup = calculateSubscriptionGroup;
 const mergeSubscriptions = (subs) => {
-    var _a;
-    const completedRelays = new Set();
-    const mergedSubscriptions = [];
-    for (const group of (0, lib_1.groupBy)(exports.calculateSubscriptionGroup, subs).values()) {
-        const groupSubscriptions = [];
-        for (const relay of (0, lib_1.uniq)(group.flatMap((sub) => sub.request.relays))) {
-            const abortedSubs = new Set();
-            const callerSubs = group.filter((sub) => sub.request.relays.includes(relay));
-            const mergedSub = (0, exports.makeSubscription)({
-                relays: [relay],
-                timeout: callerSubs[0].request.timeout,
-                closeOnEose: callerSubs[0].request.closeOnEose,
-                authTimeout: (0, lib_1.max)(callerSubs.map(r => r.request.authTimeout).filter(lib_1.identity)),
-                filters: (0, util_1.unionFilters)(callerSubs.flatMap((sub) => sub.request.filters)),
+    const mergedSub = (0, exports.makeSubscription)({
+        relays: (0, lib_1.uniq)(subs.flatMap(sub => sub.request.relays)),
+        filters: (0, util_1.unionFilters)(subs.flatMap(sub => sub.request.filters)),
+        timeout: (0, lib_1.max)(subs.map(sub => sub.request.timeout || 0)),
+        authTimeout: (0, lib_1.max)(subs.map(sub => sub.request.authTimeout || 0)),
+        closeOnEose: subs.every(sub => sub.request.closeOnEose),
+    });
+    mergedSub.controller.signal.addEventListener('abort', () => {
+        for (const sub of subs) {
+            sub.close();
+        }
+    });
+    const completedSubs = new Set();
+    for (const sub of subs) {
+        // Propagate events, but avoid duplicates
+        sub.emitter.on(SubscriptionEvent.Event, (url, event) => {
+            if (!mergedSub.tracker.track(event.id, url)) {
+                mergedSub.emitter.emit(SubscriptionEvent.Event, url, event);
+            }
+        });
+        // Propagate subscription completion. Since we split subs by relay, we need to wait
+        // until all relays are completed before we notify
+        sub.emitter.on(SubscriptionEvent.Complete, () => {
+            completedSubs.add(sub.id);
+            if (completedSubs.size === subs.length) {
+                mergedSub.emitter.emit(SubscriptionEvent.Complete);
+            }
+            sub.emitter.removeAllListeners();
+        });
+        // Propagate everything else too
+        const propagateEvent = (type) => sub.emitter.on(type, (...args) => mergedSub.emitter.emit(type, ...args));
+        propagateEvent(SubscriptionEvent.Duplicate);
+        propagateEvent(SubscriptionEvent.DeletedEvent);
+        propagateEvent(SubscriptionEvent.FailedFilter);
+        propagateEvent(SubscriptionEvent.Invalid);
+        propagateEvent(SubscriptionEvent.Eose);
+        propagateEvent(SubscriptionEvent.Close);
+    }
+    return mergedSub;
+};
+exports.mergeSubscriptions = mergeSubscriptions;
+const optimizeSubscriptions = (subs) => {
+    return Array.from((0, lib_1.groupBy)(exports.calculateSubscriptionGroup, subs).values())
+        .flatMap(group => {
+        var _a;
+        const timeout = (0, lib_1.max)(group.map(sub => sub.request.timeout || 0));
+        const authTimeout = (0, lib_1.max)(group.map(sub => sub.request.authTimeout || 0));
+        const closeOnEose = group.every(sub => sub.request.closeOnEose);
+        const completedSubs = new Set();
+        const abortedSubs = new Set();
+        const closedSubs = new Set();
+        const eosedSubs = new Set();
+        const mergedSubs = [];
+        for (const { relays, filters } of lib_1.ctx.net.optimizeSubscriptions(group)) {
+            const mergedSub = (0, exports.makeSubscription)({ filters,
+                relays,
+                timeout,
+                authTimeout,
+                closeOnEose
             });
-            for (const { id, controller, request } of callerSubs) {
+            for (const { id, controller, request } of group) {
                 const onAbort = () => {
                     abortedSubs.add(id);
-                    if (abortedSubs.size === callerSubs.length) {
+                    if (abortedSubs.size === group.length) {
                         mergedSub.close();
                     }
                 };
@@ -75,62 +121,51 @@ const mergeSubscriptions = (subs) => {
                 controller.signal.addEventListener('abort', onAbort);
             }
             mergedSub.emitter.on(SubscriptionEvent.Event, (url, event) => {
-                for (const sub of callerSubs) {
-                    if (sub.tracker.track(event.id, url)) {
-                        continue;
-                    }
-                    if (!(0, util_1.matchFilters)(sub.request.filters, event)) {
-                        continue;
+                for (const sub of group) {
+                    if (!sub.tracker.track(event.id, url) && (0, util_1.matchFilters)(sub.request.filters, event)) {
+                        sub.emitter.emit(SubscriptionEvent.Event, url, event);
                     }
-                    sub.emitter.emit(SubscriptionEvent.Event, url, event);
                 }
             });
             // Pass events back to caller
-            const propagateEvent = (type, checkFilter) => mergedSub.emitter.on(type, (url, event) => {
-                for (const sub of callerSubs) {
-                    if (!checkFilter || (0, util_1.matchFilters)(sub.request.filters, event)) {
+            const propagateEvent = (type) => mergedSub.emitter.on(type, (url, event) => {
+                for (const sub of group) {
+                    if ((0, util_1.matchFilters)(sub.request.filters, event)) {
                         sub.emitter.emit(type, url, event);
                     }
                 }
             });
-            propagateEvent(SubscriptionEvent.Duplicate, true);
-            propagateEvent(SubscriptionEvent.DeletedEvent, false);
-            propagateEvent(SubscriptionEvent.FailedFilter, false);
-            propagateEvent(SubscriptionEvent.InvalidSignature, true);
-            // Propagate eose
-            mergedSub.emitter.on(SubscriptionEvent.Eose, (url) => {
-                for (const sub of callerSubs) {
-                    sub.emitter.emit(SubscriptionEvent.Eose, url);
-                }
-            });
-            // Propagate close
-            mergedSub.emitter.on(SubscriptionEvent.Close, (url) => {
-                for (const sub of callerSubs) {
-                    sub.emitter.emit(SubscriptionEvent.Close, url);
-                }
-            });
-            // Propagate subscription completion. Since we split subs by relay, we need to wait
-            // until all relays are completed before we notify
-            mergedSub.emitter.on(SubscriptionEvent.Complete, () => {
-                completedRelays.add(relay);
-                for (const sub of callerSubs) {
-                    if (sub.request.relays.every(url => completedRelays.has(url))) {
-                        sub.emitter.emit(SubscriptionEvent.Complete);
+            propagateEvent(SubscriptionEvent.Duplicate);
+            propagateEvent(SubscriptionEvent.DeletedEvent);
+            propagateEvent(SubscriptionEvent.Invalid);
+            const propagateFinality = (type, subIds) => mergedSub.emitter.on(type, (...args) => {
+                subIds.add(mergedSub.id);
+                // Wait for all subscriptions to complete before reporting finality to the caller.
+                // This is sub-optimal, but because we're outsourcing filter/relay optimization
+                // we can't make any assumptions about which caller subscriptions have completed
+                // at any given time.
+                if (subIds.size === mergedSubs.length) {
+                    for (const sub of group) {
+                        sub.emitter.emit(type, ...args);
                     }
                 }
-                mergedSub.emitter.removeAllListeners();
+                if (type === SubscriptionEvent.Complete) {
+                    mergedSub.emitter.removeAllListeners();
+                }
             });
-            mergedSubscriptions.push(mergedSub);
-            groupSubscriptions.push(mergedSub);
+            propagateFinality(SubscriptionEvent.Eose, eosedSubs);
+            propagateFinality(SubscriptionEvent.Close, closedSubs);
+            propagateFinality(SubscriptionEvent.Complete, completedSubs);
+            mergedSubs.push(mergedSub);
         }
-    }
-    return mergedSubscriptions;
+        return mergedSubs;
+    });
 };
-exports.mergeSubscriptions = mergeSubscriptions;
+exports.optimizeSubscriptions = optimizeSubscriptions;
 const executeSubscription = (sub) => {
     const { request, emitter, tracker, controller } = sub;
-    const { timeout, filters, closeOnEose, relays, signal, authTimeout = 0 } = request;
-    const executor = Context_1.NetworkContext.getExecutor(relays);
+    const { filters, closeOnEose, relays, signal, timeout, authTimeout = 0 } = request;
+    const executor = lib_1.ctx.net.getExecutor(relays);
     const subs = [];
     const completedRelays = new Set();
     const events = [];
@@ -161,14 +196,14 @@ const executeSubscription = (sub) => {
         if (tracker.track(event.id, url)) {
             emitter.emit(SubscriptionEvent.Duplicate, url, event);
         }
-        else if (Context_1.NetworkContext.isDeleted(url, event)) {
+        else if (lib_1.ctx.net.isDeleted(url, event)) {
             emitter.emit(SubscriptionEvent.DeletedEvent, url, event);
         }
-        else if (!Context_1.NetworkContext.matchFilters(url, filters, event)) {
+        else if (!lib_1.ctx.net.matchFilters(url, filters, event)) {
             emitter.emit(SubscriptionEvent.FailedFilter, url, event);
         }
-        else if (!Context_1.NetworkContext.hasValidSignature(url, event)) {
-            emitter.emit(SubscriptionEvent.InvalidSignature, url, event);
+        else if (!lib_1.ctx.net.isValid(url, event)) {
+            emitter.emit(SubscriptionEvent.Invalid, url, event);
         }
         else {
             emitter.emit(SubscriptionEvent.Event, url, event);
@@ -206,7 +241,7 @@ const executeSubscription = (sub) => {
     }
 };
 exports.executeSubscription = executeSubscription;
-const executeSubscriptions = (subs) => (0, exports.mergeSubscriptions)(subs).forEach(exports.executeSubscription);
+const executeSubscriptions = (subs) => (0, exports.optimizeSubscriptions)(subs).forEach(exports.executeSubscription);
 exports.executeSubscriptions = executeSubscriptions;
 exports.executeSubscriptionBatched = (() => {
     const subs = [];
@@ -222,15 +257,24 @@ exports.executeSubscriptionBatched = (() => {
         timeouts.push(setTimeout(executeAll, Math.max(16, sub.request.delay)));
     };
 })();
-const subscribe = (request) => {
-    const subscription = (0, exports.makeSubscription)({ delay: 800, ...request });
+const subscribe = ({ onEvent, onEose, onClose, onComplete, ...request }) => {
+    const sub = (0, exports.makeSubscription)({ delay: 50, ...request });
     if (request.delay === 0) {
-        (0, exports.executeSubscription)(subscription);
+        (0, exports.executeSubscription)(sub);
     }
     else {
-        (0, exports.executeSubscriptionBatched)(subscription);
+        (0, exports.executeSubscriptionBatched)(sub);
     }
-    return subscription;
+    // Signature for onEvent is different from emitter signature for historical reasons and convenience
+    if (onEvent)
+        sub.emitter.on(SubscriptionEvent.Event, (url, event) => onEvent(event));
+    if (onEose)
+        sub.emitter.on(SubscriptionEvent.Eose, onEose);
+    if (onClose)
+        sub.emitter.on(SubscriptionEvent.Close, onClose);
+    if (onComplete)
+        sub.emitter.on(SubscriptionEvent.Complete, onComplete);
+    return sub;
 };
 exports.subscribe = subscribe;
 //# sourceMappingURL=Subscribe.cjs.map

package/build/src/Subscribe.cjs.map

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

package/build/src/Subscribe.d.ts

@@ -1,4 +1,5 @@
 import { Emitter } from '@welshman/lib';
+import { TrustedEvent } from '@welshman/util';
 import type { Filter } from '@welshman/util';
 import { Tracker } from "./Tracker";
 export declare enum SubscriptionEvent {
@@ -9,11 +10,13 @@ export declare enum SubscriptionEvent {
     Duplicate = "duplicate",
     DeletedEvent = "deleted-event",
     FailedFilter = "failed-filter",
-    InvalidSignature = "invalid-signature"
+    Invalid = "invalid"
 }
-export type SubscribeRequest = {
+export type RelaysAndFilters = {
     relays: string[];
     filters: Filter[];
+};
+export type SubscribeRequest = RelaysAndFilters & {
     delay?: number;
     signal?: AbortSignal;
     timeout?: number;
@@ -45,8 +48,22 @@ export declare const mergeSubscriptions: (subs: Subscription[]) => {
     tracker: Tracker;
     controller: AbortController;
     close: () => void;
+};
+export declare const optimizeSubscriptions: (subs: Subscription[]) => {
+    id: string;
+    request: SubscribeRequest;
+    emitter: Emitter;
+    tracker: Tracker;
+    controller: AbortController;
+    close: () => void;
 }[];
 export declare const executeSubscription: (sub: Subscription) => void;
 export declare const executeSubscriptions: (subs: Subscription[]) => void;
 export declare const executeSubscriptionBatched: (sub: Subscription) => void;
-export declare const subscribe: (request: SubscribeRequest) => Subscription;
+export type SubscribeRequestWithHandlers = SubscribeRequest & {
+    onEvent?: (event: TrustedEvent) => void;
+    onEose?: (url: string) => void;
+    onClose?: (url: string) => void;
+    onComplete?: () => void;
+};
+export declare const subscribe: ({ onEvent, onEose, onClose, onComplete, ...request }: SubscribeRequestWithHandlers) => Subscription;

package/build/src/Subscribe.mjs

@@ -1,13 +1,12 @@
-import { Emitter, identity, max, chunk, randomId, once, groupBy, uniq } from '@welshman/lib';
+import { ctx, Emitter, max, chunk, randomId, once, groupBy, uniq } from '@welshman/lib';
 import { matchFilters, unionFilters } from '@welshman/util';
 import { Tracker } from "./Tracker.mjs";
-import { NetworkContext } from "./Context.mjs";
 // `subscribe` is a super function that handles batching subscriptions by merging
 // them based on parameters (filters and subscribe opts), then splits them by relay.
 // This results in fewer REQs being opened per connection, fewer duplicate events
 // being downloaded, and therefore less signature validation.
 //
-// Behavior can be further configured using NetworkContext. This can be useful for
+// Behavior can be further configured using ctx.net. This can be useful for
 // adding support for querying a local cache like a relay, tracking deleted events,
 // and bypassing validation for trusted relays.
 //
@@ -24,7 +23,7 @@ export var SubscriptionEvent;
     SubscriptionEvent["Duplicate"] = "duplicate";
     SubscriptionEvent["DeletedEvent"] = "deleted-event";
     SubscriptionEvent["FailedFilter"] = "failed-filter";
-    SubscriptionEvent["InvalidSignature"] = "invalid-signature";
+    SubscriptionEvent["Invalid"] = "invalid";
 })(SubscriptionEvent || (SubscriptionEvent = {}));
 export const makeSubscription = (request) => {
     const id = randomId();
@@ -39,30 +38,76 @@ export const calculateSubscriptionGroup = (sub) => {
     const parts = [];
     if (sub.request.timeout)
         parts.push(`timeout:${sub.request.timeout}`);
+    if (sub.request.authTimeout)
+        parts.push(`authTimeout:${sub.request.authTimeout}`);
     if (sub.request.closeOnEose)
         parts.push('closeOnEose');
     return parts.join('|');
 };
 export const mergeSubscriptions = (subs) => {
-    var _a;
-    const completedRelays = new Set();
-    const mergedSubscriptions = [];
-    for (const group of groupBy(calculateSubscriptionGroup, subs).values()) {
-        const groupSubscriptions = [];
-        for (const relay of uniq(group.flatMap((sub) => sub.request.relays))) {
-            const abortedSubs = new Set();
-            const callerSubs = group.filter((sub) => sub.request.relays.includes(relay));
-            const mergedSub = makeSubscription({
-                relays: [relay],
-                timeout: callerSubs[0].request.timeout,
-                closeOnEose: callerSubs[0].request.closeOnEose,
-                authTimeout: max(callerSubs.map(r => r.request.authTimeout).filter(identity)),
-                filters: unionFilters(callerSubs.flatMap((sub) => sub.request.filters)),
+    const mergedSub = makeSubscription({
+        relays: uniq(subs.flatMap(sub => sub.request.relays)),
+        filters: unionFilters(subs.flatMap(sub => sub.request.filters)),
+        timeout: max(subs.map(sub => sub.request.timeout || 0)),
+        authTimeout: max(subs.map(sub => sub.request.authTimeout || 0)),
+        closeOnEose: subs.every(sub => sub.request.closeOnEose),
+    });
+    mergedSub.controller.signal.addEventListener('abort', () => {
+        for (const sub of subs) {
+            sub.close();
+        }
+    });
+    const completedSubs = new Set();
+    for (const sub of subs) {
+        // Propagate events, but avoid duplicates
+        sub.emitter.on(SubscriptionEvent.Event, (url, event) => {
+            if (!mergedSub.tracker.track(event.id, url)) {
+                mergedSub.emitter.emit(SubscriptionEvent.Event, url, event);
+            }
+        });
+        // Propagate subscription completion. Since we split subs by relay, we need to wait
+        // until all relays are completed before we notify
+        sub.emitter.on(SubscriptionEvent.Complete, () => {
+            completedSubs.add(sub.id);
+            if (completedSubs.size === subs.length) {
+                mergedSub.emitter.emit(SubscriptionEvent.Complete);
+            }
+            sub.emitter.removeAllListeners();
+        });
+        // Propagate everything else too
+        const propagateEvent = (type) => sub.emitter.on(type, (...args) => mergedSub.emitter.emit(type, ...args));
+        propagateEvent(SubscriptionEvent.Duplicate);
+        propagateEvent(SubscriptionEvent.DeletedEvent);
+        propagateEvent(SubscriptionEvent.FailedFilter);
+        propagateEvent(SubscriptionEvent.Invalid);
+        propagateEvent(SubscriptionEvent.Eose);
+        propagateEvent(SubscriptionEvent.Close);
+    }
+    return mergedSub;
+};
+export const optimizeSubscriptions = (subs) => {
+    return Array.from(groupBy(calculateSubscriptionGroup, subs).values())
+        .flatMap(group => {
+        var _a;
+        const timeout = max(group.map(sub => sub.request.timeout || 0));
+        const authTimeout = max(group.map(sub => sub.request.authTimeout || 0));
+        const closeOnEose = group.every(sub => sub.request.closeOnEose);
+        const completedSubs = new Set();
+        const abortedSubs = new Set();
+        const closedSubs = new Set();
+        const eosedSubs = new Set();
+        const mergedSubs = [];
+        for (const { relays, filters } of ctx.net.optimizeSubscriptions(group)) {
+            const mergedSub = makeSubscription({ filters,
+                relays,
+                timeout,
+                authTimeout,
+                closeOnEose
             });
-            for (const { id, controller, request } of callerSubs) {
+            for (const { id, controller, request } of group) {
                 const onAbort = () => {
                     abortedSubs.add(id);
-                    if (abortedSubs.size === callerSubs.length) {
+                    if (abortedSubs.size === group.length) {
                         mergedSub.close();
                     }
                 };
@@ -70,61 +115,50 @@ export const mergeSubscriptions = (subs) => {
                 controller.signal.addEventListener('abort', onAbort);
             }
             mergedSub.emitter.on(SubscriptionEvent.Event, (url, event) => {
-                for (const sub of callerSubs) {
-                    if (sub.tracker.track(event.id, url)) {
-                        continue;
-                    }
-                    if (!matchFilters(sub.request.filters, event)) {
-                        continue;
+                for (const sub of group) {
+                    if (!sub.tracker.track(event.id, url) && matchFilters(sub.request.filters, event)) {
+                        sub.emitter.emit(SubscriptionEvent.Event, url, event);
                     }
-                    sub.emitter.emit(SubscriptionEvent.Event, url, event);
                 }
             });
             // Pass events back to caller
-            const propagateEvent = (type, checkFilter) => mergedSub.emitter.on(type, (url, event) => {
-                for (const sub of callerSubs) {
-                    if (!checkFilter || matchFilters(sub.request.filters, event)) {
+            const propagateEvent = (type) => mergedSub.emitter.on(type, (url, event) => {
+                for (const sub of group) {
+                    if (matchFilters(sub.request.filters, event)) {
                         sub.emitter.emit(type, url, event);
                     }
                 }
             });
-            propagateEvent(SubscriptionEvent.Duplicate, true);
-            propagateEvent(SubscriptionEvent.DeletedEvent, false);
-            propagateEvent(SubscriptionEvent.FailedFilter, false);
-            propagateEvent(SubscriptionEvent.InvalidSignature, true);
-            // Propagate eose
-            mergedSub.emitter.on(SubscriptionEvent.Eose, (url) => {
-                for (const sub of callerSubs) {
-                    sub.emitter.emit(SubscriptionEvent.Eose, url);
-                }
-            });
-            // Propagate close
-            mergedSub.emitter.on(SubscriptionEvent.Close, (url) => {
-                for (const sub of callerSubs) {
-                    sub.emitter.emit(SubscriptionEvent.Close, url);
-                }
-            });
-            // Propagate subscription completion. Since we split subs by relay, we need to wait
-            // until all relays are completed before we notify
-            mergedSub.emitter.on(SubscriptionEvent.Complete, () => {
-                completedRelays.add(relay);
-                for (const sub of callerSubs) {
-                    if (sub.request.relays.every(url => completedRelays.has(url))) {
-                        sub.emitter.emit(SubscriptionEvent.Complete);
+            propagateEvent(SubscriptionEvent.Duplicate);
+            propagateEvent(SubscriptionEvent.DeletedEvent);
+            propagateEvent(SubscriptionEvent.Invalid);
+            const propagateFinality = (type, subIds) => mergedSub.emitter.on(type, (...args) => {
+                subIds.add(mergedSub.id);
+                // Wait for all subscriptions to complete before reporting finality to the caller.
+                // This is sub-optimal, but because we're outsourcing filter/relay optimization
+                // we can't make any assumptions about which caller subscriptions have completed
+                // at any given time.
+                if (subIds.size === mergedSubs.length) {
+                    for (const sub of group) {
+                        sub.emitter.emit(type, ...args);
                     }
                 }
-                mergedSub.emitter.removeAllListeners();
+                if (type === SubscriptionEvent.Complete) {
+                    mergedSub.emitter.removeAllListeners();
+                }
             });
-            mergedSubscriptions.push(mergedSub);
-            groupSubscriptions.push(mergedSub);
+            propagateFinality(SubscriptionEvent.Eose, eosedSubs);
+            propagateFinality(SubscriptionEvent.Close, closedSubs);
+            propagateFinality(SubscriptionEvent.Complete, completedSubs);
+            mergedSubs.push(mergedSub);
         }
-    }
-    return mergedSubscriptions;
+        return mergedSubs;
+    });
 };
 export const executeSubscription = (sub) => {
     const { request, emitter, tracker, controller } = sub;
-    const { timeout, filters, closeOnEose, relays, signal, authTimeout = 0 } = request;
-    const executor = NetworkContext.getExecutor(relays);
+    const { filters, closeOnEose, relays, signal, timeout, authTimeout = 0 } = request;
+    const executor = ctx.net.getExecutor(relays);
     const subs = [];
     const completedRelays = new Set();
     const events = [];
@@ -155,14 +189,14 @@ export const executeSubscription = (sub) => {
         if (tracker.track(event.id, url)) {
             emitter.emit(SubscriptionEvent.Duplicate, url, event);
         }
-        else if (NetworkContext.isDeleted(url, event)) {
+        else if (ctx.net.isDeleted(url, event)) {
             emitter.emit(SubscriptionEvent.DeletedEvent, url, event);
         }
-        else if (!NetworkContext.matchFilters(url, filters, event)) {
+        else if (!ctx.net.matchFilters(url, filters, event)) {
             emitter.emit(SubscriptionEvent.FailedFilter, url, event);
         }
-        else if (!NetworkContext.hasValidSignature(url, event)) {
-            emitter.emit(SubscriptionEvent.InvalidSignature, url, event);
+        else if (!ctx.net.isValid(url, event)) {
+            emitter.emit(SubscriptionEvent.Invalid, url, event);
         }
         else {
             emitter.emit(SubscriptionEvent.Event, url, event);
@@ -199,7 +233,7 @@ export const executeSubscription = (sub) => {
         onComplete();
     }
 };
-export const executeSubscriptions = (subs) => mergeSubscriptions(subs).forEach(executeSubscription);
+export const executeSubscriptions = (subs) => optimizeSubscriptions(subs).forEach(executeSubscription);
 export const executeSubscriptionBatched = (() => {
     const subs = [];
     const timeouts = [];
@@ -214,14 +248,23 @@ export const executeSubscriptionBatched = (() => {
         timeouts.push(setTimeout(executeAll, Math.max(16, sub.request.delay)));
     };
 })();
-export const subscribe = (request) => {
-    const subscription = makeSubscription({ delay: 800, ...request });
+export const subscribe = ({ onEvent, onEose, onClose, onComplete, ...request }) => {
+    const sub = makeSubscription({ delay: 50, ...request });
     if (request.delay === 0) {
-        executeSubscription(subscription);
+        executeSubscription(sub);
     }
     else {
-        executeSubscriptionBatched(subscription);
+        executeSubscriptionBatched(sub);
     }
-    return subscription;
+    // Signature for onEvent is different from emitter signature for historical reasons and convenience
+    if (onEvent)
+        sub.emitter.on(SubscriptionEvent.Event, (url, event) => onEvent(event));
+    if (onEose)
+        sub.emitter.on(SubscriptionEvent.Eose, onEose);
+    if (onClose)
+        sub.emitter.on(SubscriptionEvent.Close, onClose);
+    if (onComplete)
+        sub.emitter.on(SubscriptionEvent.Complete, onComplete);
+    return sub;
 };
 //# sourceMappingURL=Subscribe.mjs.map