covara 0.6.0 → 0.7.0

package/dist/resource/subscription.d.ts

@@ -3,6 +3,10 @@ import { Filter } from "./filter.js";
 import { Subscription, ChangelogEntry } from "./types.js";
 export type BackpressurePolicy = "invalidate" | "disconnect" | "drop";
 export declare const registerResourceMask: (resource: string, mask: (item: Record<string, unknown>) => Record<string, unknown>) => void;
+type AggregateWatcher = (changed?: Record<string, unknown>[]) => void;
+export declare const registerAggregateWatcher: (resource: string, watcher: AggregateWatcher) => (() => void);
+export declare const notifyAggregateWatchers: (resource: string, changed?: Record<string, unknown>[]) => Promise<void>;
+export declare const getAggregateWatcherCount: (resource?: string) => number;
 export declare const addRelevantObject: (subscriptionId: string, objectId: string) => Promise<void>;
 export declare const registerKnownIds: (subscriptionId: string, ids: string[]) => Promise<void>;
 export interface CreateSubscriptionOptions {
@@ -24,7 +28,7 @@ export declare const sendExistingItems: <T extends Record<string, unknown>>(subs
 export type RelationLoader<T> = (items: T[], include: string) => Promise<T[]>;
 export declare const pushInsertsToSubscriptions: <T extends Record<string, unknown>>(resource: string, filterFactory: Filter, items: T[], idColumn: string, optimisticIds?: Map<string, string>, relationLoader?: RelationLoader<T>) => Promise<void>;
 export declare const pushUpdatesToSubscriptions: <T extends Record<string, unknown>>(resource: string, filterFactory: Filter, items: T[], idColumn: string, previousItems?: Map<string, T>, relationLoader?: RelationLoader<T>) => Promise<void>;
-export declare const pushDeletesToSubscriptions: (resource: string, deletedIds: string[]) => Promise<void>;
+export declare const pushDeletesToSubscriptions: (resource: string, deletedIds: string[], deletedObjects?: Record<string, unknown>[]) => Promise<void>;
 export declare const sendInvalidateEvent: (subscriptionId: string, reason?: string) => Promise<void>;
 export declare const invalidateResourceSubscriptions: (resource: string, reason?: string) => Promise<void>;
 export declare const processChangelogEntries: (entries: ChangelogEntry[], filterFactory: Filter, idColumn: string) => Promise<void>;
@@ -42,5 +46,18 @@ export declare const getSubscriptionStats: () => Promise<{
 }>;
 export declare const closeAllHandlers: () => number;
 export declare const getActiveHandlerCount: () => number;
+export interface ActiveSubscriptionInfo {
+    id: string;
+    resource: string;
+    filter?: string;
+    userId?: string;
+    connectedAt: string;
+    eventCount: number;
+    lastEventAt?: string;
+    connected: boolean;
+}
+export declare const listActiveSubscriptions: () => Promise<ActiveSubscriptionInfo[]>;
+export declare const disconnectSubscription: (subscriptionId: string) => Promise<boolean>;
 export declare const clearAllSubscriptions: () => Promise<void>;
+export {};
 //# sourceMappingURL=subscription.d.ts.map

package/dist/resource/subscription.d.ts.map

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

package/dist/resource/subscription.js

@@ -21,15 +21,59 @@ const maskForResource = (resource, item) => {
 const compiledFiltersCache = new Map();
 // Track which handler IDs are local to this process
 const localHandlerIds = new Set();
+const aggregateWatchers = new Map();
 // In-memory fallback storage (used when KV is not configured)
 const localSubscriptions = new Map();
 const localRelevantObjects = new Map();
 const localSeqCounters = new Map();
+const localSubsByResource = new Map();
+// Last event delivery time per subscription (process-local, best effort) for
+// the admin UI's "Last Event" column.
+const localEventTimestamps = new Map();
+// SSE handlers are strictly process-local, so every subscription created for a
+// handler is known to this process. Tracking handler → subscription IDs here
+// lets disconnect cleanup run in O(own subscriptions) without scanning KV.
+const localHandlerSubs = new Map();
+const localSubHandlers = new Map();
+const trackHandlerSubscription = (handlerId, subscriptionId) => {
+    let subs = localHandlerSubs.get(handlerId);
+    if (!subs) {
+        subs = new Set();
+        localHandlerSubs.set(handlerId, subs);
+    }
+    subs.add(subscriptionId);
+    localSubHandlers.set(subscriptionId, handlerId);
+};
+const untrackSubscription = (subscriptionId) => {
+    const handlerId = localSubHandlers.get(subscriptionId);
+    if (handlerId === undefined)
+        return;
+    localSubHandlers.delete(subscriptionId);
+    const subs = localHandlerSubs.get(handlerId);
+    if (subs) {
+        subs.delete(subscriptionId);
+        if (subs.size === 0)
+            localHandlerSubs.delete(handlerId);
+    }
+};
 // KV keys
-const SUBSCRIPTIONS_HASH = "covara:subscriptions";
+// Subscriptions are sharded into one hash per resource so a mutation only ever
+// loads the subscriptions of the resource it touched — never the whole fleet.
+// A small set of resource names (the index) lets cold paths (stats, admin
+// listing, clearAll) enumerate the shards.
+const SUBSCRIPTIONS_BY_RESOURCE_PREFIX = "covara:subs:byres:";
+const SUBSCRIPTIONS_RESOURCE_INDEX = "covara:subs:resources";
+const subscriptionHashKey = (resource) => `${SUBSCRIPTIONS_BY_RESOURCE_PREFIX}${resource}`;
+// The resource is embedded in the subscription ID (`<uuid>:<resource>`) so
+// ID-only operations (get/remove/updateSeq) can address the right shard
+// without a secondary lookup. UUIDs are exactly 36 chars and contain no colon.
+const resourceFromSubscriptionId = (subscriptionId) => subscriptionId.length > 37 && subscriptionId[36] === ":"
+    ? subscriptionId.slice(37)
+    : null;
 const SUBSCRIPTION_OBJECTS_PREFIX = "covara:sub:objects:";
 const SUBSCRIPTION_SEQ_PREFIX = "covara:sub:seq:";
 const EVENTS_CHANNEL = "covara:events";
+const AGGREGATE_CHANNEL = "covara:aggregate";
 const serializeSubscription = (sub) => {
     const serialized = {
         id: sub.id,
@@ -64,6 +108,61 @@ const deserializeSubscription = (data) => {
 const getKV = () => {
     return hasGlobalKV() ? getGlobalKV() : null;
 };
+// Register a callback invoked whenever the given resource is mutated, for
+// aggregate subscriptions to recompute. Returns an unsubscribe function.
+export const registerAggregateWatcher = (resource, watcher) => {
+    let set = aggregateWatchers.get(resource);
+    if (!set) {
+        set = new Set();
+        aggregateWatchers.set(resource, set);
+    }
+    set.add(watcher);
+    return () => {
+        const current = aggregateWatchers.get(resource);
+        if (!current)
+            return;
+        current.delete(watcher);
+        if (current.size === 0)
+            aggregateWatchers.delete(resource);
+    };
+};
+const notifyLocalAggregateWatchers = (resource, changed) => {
+    const set = aggregateWatchers.get(resource);
+    if (!set)
+        return;
+    for (const watcher of set) {
+        try {
+            watcher(changed);
+        }
+        catch {
+            // a failing watcher must not break mutation processing
+        }
+    }
+};
+// Signal that a resource was mutated so aggregate subscriptions recompute.
+// Notifies local watchers immediately (with the changed rows, when available,
+// so watchers can skip recompute for out-of-scope mutations) and (when KV is
+// configured) publishes to other processes. The cross-process notification
+// carries no row data — remote watchers recompute conservatively — to avoid
+// shipping raw rows over pub/sub. Double-delivery to the publisher is harmless;
+// watchers debounce before recomputing.
+export const notifyAggregateWatchers = async (resource, changed) => {
+    if (aggregateWatchers.size > 0) {
+        notifyLocalAggregateWatchers(resource, changed);
+    }
+    const kv = getKV();
+    if (kv) {
+        await kv.publish(AGGREGATE_CHANNEL, JSON.stringify({ resource }));
+    }
+};
+export const getAggregateWatcherCount = (resource) => {
+    if (resource)
+        return aggregateWatchers.get(resource)?.size ?? 0;
+    let total = 0;
+    for (const set of aggregateWatchers.values())
+        total += set.size;
+    return total;
+};
 // Load relevant object IDs from KV or local storage
 const loadRelevantObjects = async (subscriptionId) => {
     const kv = getKV();
@@ -126,7 +225,7 @@ const isObjectRelevant = async (subscriptionId, objectId) => {
     return objects?.has(objectId) ?? false;
 };
 export const createSubscription = async (options) => {
-    const subscriptionId = uuidv4();
+    const subscriptionId = `${uuidv4()}:${options.resource}`;
     const subscription = {
         id: subscriptionId,
         createdAt: new Date(),
@@ -142,24 +241,53 @@ export const createSubscription = async (options) => {
     };
     const kv = getKV();
     if (kv) {
-        await kv.hset(SUBSCRIPTIONS_HASH, subscriptionId, serializeSubscription(subscription));
+        await kv.hset(subscriptionHashKey(options.resource), subscriptionId, serializeSubscription(subscription));
+        await kv.sadd(SUBSCRIPTIONS_RESOURCE_INDEX, options.resource);
         await kv.set(`${SUBSCRIPTION_SEQ_PREFIX}${subscriptionId}`, "0");
     }
     else {
         // Store in local memory
         localSubscriptions.set(subscriptionId, subscription);
         localSeqCounters.set(subscriptionId, 0);
+        let byResource = localSubsByResource.get(options.resource);
+        if (!byResource) {
+            byResource = new Set();
+            localSubsByResource.set(options.resource, byResource);
+        }
+        byResource.add(subscriptionId);
     }
+    trackHandlerSubscription(options.handlerId, subscriptionId);
     return subscriptionId;
 };
 export const removeSubscription = async (subscriptionId) => {
     compiledFiltersCache.delete(subscriptionId);
+    untrackSubscription(subscriptionId);
+    localEventTimestamps.delete(subscriptionId);
     const kv = getKV();
     if (kv) {
-        await kv.hdel(SUBSCRIPTIONS_HASH, subscriptionId);
+        const resource = resourceFromSubscriptionId(subscriptionId);
+        if (resource) {
+            await kv.hdel(subscriptionHashKey(resource), subscriptionId);
+        }
+        else {
+            // Unknown ID format: clear it from every shard (cold fallback).
+            const resources = await kv.smembers(SUBSCRIPTIONS_RESOURCE_INDEX);
+            for (const res of resources) {
+                await kv.hdel(subscriptionHashKey(res), subscriptionId);
+            }
+        }
         await kv.del(`${SUBSCRIPTION_OBJECTS_PREFIX}${subscriptionId}`, `${SUBSCRIPTION_SEQ_PREFIX}${subscriptionId}`);
     }
     else {
+        const sub = localSubscriptions.get(subscriptionId);
+        if (sub) {
+            const byResource = localSubsByResource.get(sub.resource);
+            if (byResource) {
+                byResource.delete(subscriptionId);
+                if (byResource.size === 0)
+                    localSubsByResource.delete(sub.resource);
+            }
+        }
         localSubscriptions.delete(subscriptionId);
         localRelevantObjects.delete(subscriptionId);
         localSeqCounters.delete(subscriptionId);
@@ -168,7 +296,20 @@ export const removeSubscription = async (subscriptionId) => {
 export const getSubscription = async (subscriptionId) => {
     const kv = getKV();
     if (kv) {
-        const data = await kv.hget(SUBSCRIPTIONS_HASH, subscriptionId);
+        const resource = resourceFromSubscriptionId(subscriptionId);
+        let data = null;
+        if (resource) {
+            data = await kv.hget(subscriptionHashKey(resource), subscriptionId);
+        }
+        else {
+            // Unknown ID format: check every shard (cold fallback).
+            const resources = await kv.smembers(SUBSCRIPTIONS_RESOURCE_INDEX);
+            for (const res of resources) {
+                data = await kv.hget(subscriptionHashKey(res), subscriptionId);
+                if (data)
+                    break;
+            }
+        }
         if (!data)
             return undefined;
         const subscription = deserializeSubscription(data);
@@ -190,27 +331,26 @@ export const unregisterHandler = async (handlerId) => {
     localHandlers.delete(handlerId);
     localHandlerIds.delete(handlerId);
     localHandlerPolicies.delete(handlerId);
-    const kv = getKV();
-    if (kv) {
-        // Get all subscriptions and remove those belonging to this handler
-        const allSubs = await kv.hgetall(SUBSCRIPTIONS_HASH);
-        for (const [subId, data] of Object.entries(allSubs)) {
-            const sub = deserializeSubscription(data);
-            if (sub.handlerId === handlerId) {
-                await removeSubscription(subId);
-            }
+    // Handlers are process-local, so their subscriptions were created here and
+    // are tracked locally — disconnect cleanup is O(own subscriptions), no scan.
+    const tracked = localHandlerSubs.get(handlerId);
+    if (tracked) {
+        for (const subId of Array.from(tracked)) {
+            await removeSubscription(subId);
         }
+        return;
     }
-    else {
-        // Clean up local subscriptions for this handler
-        for (const [subId, sub] of localSubscriptions.entries()) {
-            if (sub.handlerId === handlerId) {
-                await removeSubscription(subId);
-            }
+    // Untracked handler (e.g. cleanup of subscriptions created by a previous
+    // process incarnation): fall back to scanning every shard.
+    const allSubs = await getAllSubscriptions();
+    for (const [subId, sub] of allSubs) {
+        if (sub.handlerId === handlerId) {
+            await removeSubscription(subId);
         }
     }
 };
 const getNextSeq = async (subscriptionId) => {
+    localEventTimestamps.set(subscriptionId, Date.now());
     const kv = getKV();
     if (kv) {
         return kv.incr(`${SUBSCRIPTION_SEQ_PREFIX}${subscriptionId}`);
@@ -220,17 +360,45 @@ const getNextSeq = async (subscriptionId) => {
     localSeqCounters.set(subscriptionId, next);
     return next;
 };
-// Helper to get all subscriptions from KV or local storage
-const getAllSubscriptions = async () => {
+// Load one resource's subscriptions. This is the hot-path accessor used by the
+// mutation push functions — cost scales with that resource's subscriber count,
+// not the total subscription count.
+const getSubscriptionsForResourceMap = async (resource) => {
     const kv = getKV();
     if (kv) {
         const result = new Map();
-        const allSubs = await kv.hgetall(SUBSCRIPTIONS_HASH);
-        for (const [subId, data] of Object.entries(allSubs)) {
+        const subs = await kv.hgetall(subscriptionHashKey(resource));
+        for (const [subId, data] of Object.entries(subs)) {
             result.set(subId, deserializeSubscription(data));
         }
         return result;
     }
+    const result = new Map();
+    const ids = localSubsByResource.get(resource);
+    if (!ids)
+        return result;
+    for (const id of ids) {
+        const sub = localSubscriptions.get(id);
+        if (sub)
+            result.set(id, sub);
+    }
+    return result;
+};
+// Enumerate every shard. Cold paths only (stats, admin listing, fallback
+// cleanup) — never called per mutation.
+const getAllSubscriptions = async () => {
+    const kv = getKV();
+    if (kv) {
+        const result = new Map();
+        const resources = await kv.smembers(SUBSCRIPTIONS_RESOURCE_INDEX);
+        for (const resource of resources) {
+            const subs = await kv.hgetall(subscriptionHashKey(resource));
+            for (const [subId, data] of Object.entries(subs)) {
+                result.set(subId, deserializeSubscription(data));
+            }
+        }
+        return result;
+    }
     return new Map(localSubscriptions);
 };
 const getCompiledFilter = (subscription, filterFactory) => {
@@ -320,6 +488,18 @@ export const initializeEventSubscription = async () => {
             // Ignore malformed messages
         }
     });
+    // Fan out cross-process mutation signals to local aggregate watchers.
+    await kv.subscribe(AGGREGATE_CHANNEL, (message) => {
+        try {
+            const { resource } = JSON.parse(message);
+            if (typeof resource === "string") {
+                notifyLocalAggregateWatchers(resource);
+            }
+        }
+        catch {
+            // Ignore malformed messages
+        }
+    });
 };
 export const sendExistingItems = async (subscriptionId, items, idColumn) => {
     const subscription = await getSubscription(subscriptionId);
@@ -346,7 +526,7 @@ export const sendExistingItems = async (subscriptionId, items, idColumn) => {
     }
 };
 export const pushInsertsToSubscriptions = async (resource, filterFactory, items, idColumn, optimisticIds, relationLoader) => {
-    const allSubs = await getAllSubscriptions();
+    const allSubs = await getSubscriptionsForResourceMap(resource);
     // Cache for items with relations loaded (keyed by include string)
     const itemsWithRelationsCache = new Map();
     const getItemWithRelations = async (item, include) => {
@@ -398,9 +578,10 @@ export const pushInsertsToSubscriptions = async (resource, filterFactory, items,
             }
         }
     }
+    await notifyAggregateWatchers(resource, items);
 };
 export const pushUpdatesToSubscriptions = async (resource, filterFactory, items, idColumn, previousItems, relationLoader) => {
-    const allSubs = await getAllSubscriptions();
+    const allSubs = await getSubscriptionsForResourceMap(resource);
     // Cache for items with relations loaded (keyed by include string)
     const itemsWithRelationsCache = new Map();
     const getItemWithRelations = async (item, include) => {
@@ -482,9 +663,17 @@ export const pushUpdatesToSubscriptions = async (resource, filterFactory, items,
             }
         }
     }
+    // Pass both new and previous state: an update can move a row into or out of a
+    // filtered aggregate's scope, so a watcher must recompute if either matches.
+    const changed = [...items];
+    if (previousItems) {
+        for (const prev of previousItems.values())
+            changed.push(prev);
+    }
+    await notifyAggregateWatchers(resource, changed);
 };
-export const pushDeletesToSubscriptions = async (resource, deletedIds) => {
-    const allSubs = await getAllSubscriptions();
+export const pushDeletesToSubscriptions = async (resource, deletedIds, deletedObjects) => {
+    const allSubs = await getSubscriptionsForResourceMap(resource);
     for (const [subId, subscription] of allSubs) {
         if (subscription.resource !== resource)
             continue;
@@ -506,6 +695,10 @@ export const pushDeletesToSubscriptions = async (resource, deletedIds) => {
             }
         }
     }
+    // When the deleted rows' prior content is available, watchers can scope-skip:
+    // a row that wasn't in a subscription's scope can't change its aggregate.
+    // Without it (IDs only) every watcher must recompute conservatively.
+    await notifyAggregateWatchers(resource, deletedObjects);
 };
 export const sendInvalidateEvent = async (subscriptionId, reason) => {
     const subscription = await getSubscription(subscriptionId);
@@ -527,12 +720,11 @@ export const sendInvalidateEvent = async (subscriptionId, reason) => {
 // refetch. Used for mutations the framework can't observe row-by-row: raw SQL
 // and writes from external processes (via recordExternalMutation).
 export const invalidateResourceSubscriptions = async (resource, reason) => {
-    const allSubs = await getAllSubscriptions();
-    for (const [subId, subscription] of allSubs) {
-        if (subscription.resource !== resource)
-            continue;
+    const allSubs = await getSubscriptionsForResourceMap(resource);
+    for (const subId of allSubs.keys()) {
         await sendInvalidateEvent(subId, reason);
     }
+    await notifyAggregateWatchers(resource);
 };
 export const processChangelogEntries = async (entries, filterFactory, idColumn) => {
     for (const entry of entries) {
@@ -562,13 +754,10 @@ export const getSubscriptionsForResource = async (resource) => {
     if (!kv)
         return [];
     const result = [];
-    const allSubs = await kv.hgetall(SUBSCRIPTIONS_HASH);
-    for (const data of Object.values(allSubs)) {
-        const subscription = deserializeSubscription(data);
-        if (subscription.resource === resource) {
-            subscription.relevantObjectIds = await loadRelevantObjects(subscription.id);
-            result.push(subscription);
-        }
+    const subs = await getSubscriptionsForResourceMap(resource);
+    for (const subscription of subs.values()) {
+        subscription.relevantObjectIds = await loadRelevantObjects(subscription.id);
+        result.push(subscription);
     }
     return result;
 };
@@ -576,12 +765,16 @@ export const updateSubscriptionSeq = async (subscriptionId, seq) => {
     const kv = getKV();
     if (!kv)
         return;
-    const data = await kv.hget(SUBSCRIPTIONS_HASH, subscriptionId);
+    const resource = resourceFromSubscriptionId(subscriptionId);
+    if (!resource)
+        return;
+    const hashKey = subscriptionHashKey(resource);
+    const data = await kv.hget(hashKey, subscriptionId);
     if (!data)
         return;
     const subscription = deserializeSubscription(data);
     subscription.lastSeq = seq;
-    await kv.hset(SUBSCRIPTIONS_HASH, subscriptionId, serializeSubscription(subscription));
+    await kv.hset(hashKey, subscriptionId, serializeSubscription(subscription));
 };
 export const getCatchupEvents = async (subscriptionId, sinceSeq) => {
     const subscription = await getSubscription(subscriptionId);
@@ -604,10 +797,13 @@ export const getHandlerSubscriptions = async (handlerId) => {
     const kv = getKV();
     if (!kv)
         return [];
+    // Fast path: handlers are process-local, so their subscriptions are tracked.
+    const tracked = localHandlerSubs.get(handlerId);
+    if (tracked)
+        return Array.from(tracked);
     const result = [];
-    const allSubs = await kv.hgetall(SUBSCRIPTIONS_HASH);
-    for (const [id, data] of Object.entries(allSubs)) {
-        const sub = deserializeSubscription(data);
+    const allSubs = await getAllSubscriptions();
+    for (const [id, sub] of allSubs) {
         if (sub.handlerId === handlerId) {
             result.push(id);
         }
@@ -633,14 +829,13 @@ export const getSubscriptionStats = async () => {
         };
     }
     const subscriptionsByResource = {};
-    const allSubs = await kv.hgetall(SUBSCRIPTIONS_HASH);
-    for (const data of Object.values(allSubs)) {
-        const sub = deserializeSubscription(data);
+    const allSubs = await getAllSubscriptions();
+    for (const sub of allSubs.values()) {
         subscriptionsByResource[sub.resource] =
             (subscriptionsByResource[sub.resource] ?? 0) + 1;
     }
     return {
-        totalSubscriptions: Object.keys(allSubs).length,
+        totalSubscriptions: allSubs.size,
         totalHandlers: localHandlers.size,
         subscriptionsByResource,
     };
@@ -662,20 +857,82 @@ export const closeAllHandlers = () => {
     return closed;
 };
 export const getActiveHandlerCount = () => localHandlers.size;
+// Snapshot of registered subscriptions (KV-backed or local), flagged by whether
+// their SSE handler is connected to this process. Shaped for the admin UI's
+// subscriptions view.
+export const listActiveSubscriptions = async () => {
+    const all = await getAllSubscriptions();
+    const kv = getKV();
+    const result = [];
+    for (const s of all.values()) {
+        // The per-subscription seq counter increments once per delivered event, so
+        // it doubles as the event count.
+        let eventCount = 0;
+        if (kv) {
+            const raw = await kv.get(`${SUBSCRIPTION_SEQ_PREFIX}${s.id}`);
+            eventCount = raw ? parseInt(raw, 10) || 0 : 0;
+        }
+        else {
+            eventCount = localSeqCounters.get(s.id) ?? 0;
+        }
+        const lastEventAt = localEventTimestamps.get(s.id);
+        result.push({
+            id: s.id,
+            resource: s.resource,
+            filter: s.filter || undefined,
+            userId: s.authId ?? undefined,
+            connectedAt: s.createdAt instanceof Date ? s.createdAt.toISOString() : String(s.createdAt ?? ""),
+            eventCount,
+            lastEventAt: lastEventAt ? new Date(lastEventAt).toISOString() : undefined,
+            connected: localHandlerIds.has(s.handlerId),
+        });
+    }
+    return result;
+};
+// Force-close a subscription from the admin UI. Closing the local SSE writer
+// triggers the route's cleanup (handler unregister + record removal). When the
+// connection lives on another process, invalidate it (so the client refetches)
+// and drop the record so delivery stops.
+export const disconnectSubscription = async (subscriptionId) => {
+    const subscription = await getSubscription(subscriptionId);
+    if (!subscription)
+        return false;
+    const handler = localHandlers.get(subscription.handlerId);
+    if (handler) {
+        handler.close();
+        return true;
+    }
+    await sendInvalidateEvent(subscriptionId, "Disconnected by admin");
+    await removeSubscription(subscriptionId);
+    return true;
+};
 export const clearAllSubscriptions = async () => {
     compiledFiltersCache.clear();
     localHandlers.clear();
     localHandlerIds.clear();
     localHandlerPolicies.clear();
+    localHandlerSubs.clear();
+    localSubHandlers.clear();
+    localSubscriptions.clear();
+    localRelevantObjects.clear();
+    localSeqCounters.clear();
+    localSubsByResource.clear();
+    localEventTimestamps.clear();
     eventSubscriptionInitialized = false;
     const kv = getKV();
     if (!kv)
         return;
-    // Get all subscription IDs to clear their related keys
-    const allSubs = await kv.hgetall(SUBSCRIPTIONS_HASH);
-    const keysToDelete = [SUBSCRIPTIONS_HASH];
-    for (const subId of Object.keys(allSubs)) {
-        keysToDelete.push(`${SUBSCRIPTION_OBJECTS_PREFIX}${subId}`, `${SUBSCRIPTION_SEQ_PREFIX}${subId}`);
+    // Enumerate every resource shard and clear it plus each subscription's
+    // related keys, then drop the resource index itself.
+    const resources = await kv.smembers(SUBSCRIPTIONS_RESOURCE_INDEX);
+    const keysToDelete = [SUBSCRIPTIONS_RESOURCE_INDEX];
+    for (const resource of resources) {
+        const hashKey = subscriptionHashKey(resource);
+        keysToDelete.push(hashKey);
+        const subs = await kv.hgetall(hashKey);
+        for (const subId of Object.keys(subs)) {
+            keysToDelete.push(`${SUBSCRIPTION_OBJECTS_PREFIX}${subId}`, `${SUBSCRIPTION_SEQ_PREFIX}${subId}`);
+        }
     }
     if (keysToDelete.length > 0) {
         await kv.del(...keysToDelete);