nostr-idb 2.1.4 → 2.1.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # nostr-idb
 
+## 2.1.5
+
+### Patch Changes
+
+- Add timeout for subscriptions
+
 ## 2.1.4
 
 ### Patch Changes

package/dist/relay/relay-core.d.ts

@@ -34,6 +34,7 @@ export declare class RelayCore {
     private writeQueue;
     private indexCache;
     db: NostrIDB;
+    baseEoseTimeout: number;
     private subscriptions;
     constructor(db: NostrIDB, opts?: RelayCoreOptions);
     start(): Promise<void>;

package/dist/relay/relay-core.js

@@ -27,6 +27,7 @@ export class RelayCore {
     writeQueue;
     indexCache;
     db;
+    baseEoseTimeout = 4400;
     subscriptions = new Map();
     constructor(db, opts = {}) {
         this.db = db;
@@ -86,26 +87,35 @@ export class RelayCore {
         log(`Running ${sub.id}`, sub.filters);
         // load any events from the write queue
         const eventsFromQueue = this.writeQueue.matchPending(sub.filters);
-        // get events
-        await getEventsForFilters(this.db, sub.filters, this.indexCache, this.eventMap).then((filterEvents) => {
-            this.addToEventMaps(filterEvents);
-            if (sub.onevent) {
-                const idsFromQueue = new Set(eventsFromQueue.map((e) => e.id));
-                const events = eventsFromQueue.length > 0
-                    ? [
-                        ...filterEvents.filter((e) => !idsFromQueue.has(e.id)),
-                        ...eventsFromQueue,
-                    ].sort(sortByDate)
-                    : filterEvents;
-                for (const event of events) {
-                    sub.onevent(event);
-                    this.writeQueue.useEvent(event);
+        return new Promise((res, rej) => {
+            const timeout = setTimeout(() => {
+                if (sub.oneose)
+                    sub.oneose();
+                res();
+            }, this.baseEoseTimeout);
+            // get events
+            getEventsForFilters(this.db, sub.filters, this.indexCache, this.eventMap).then((filterEvents) => {
+                clearTimeout(timeout);
+                this.addToEventMaps(filterEvents);
+                if (sub.onevent) {
+                    const idsFromQueue = new Set(eventsFromQueue.map((e) => e.id));
+                    const events = eventsFromQueue.length > 0
+                        ? [
+                            ...filterEvents.filter((e) => !idsFromQueue.has(e.id)),
+                            ...eventsFromQueue,
+                        ].sort(sortByDate)
+                        : filterEvents;
+                    for (const event of events) {
+                        sub.onevent(event);
+                        this.writeQueue.useEvent(event);
+                    }
+                    const delta = new Date().valueOf() - start;
+                    log(`Finished ${sub.id} took ${delta}ms and got ${events.length} events`);
                 }
-                const delta = new Date().valueOf() - start;
-                log(`Finished ${sub.id} took ${delta}ms and got ${events.length} events`);
-            }
-            if (sub.oneose)
-                sub.oneose();
+                if (sub.oneose)
+                    sub.oneose();
+                res();
+            });
         });
     }
     subscribe(filters, options) {