fix: bug in subscription auto abortion of SimplePool/NDK adapter

jiftechnify · Jun 20, 2023 · 4fd8879 · 4fd8879
1 parent 1a157b0
commit 4fd8879
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/packages/adapter-ndk/src/index.ts b/packages/adapter-ndk/src/index.ts
@@ -144,14 +144,6 @@ class NDKAdapter implements NostrFetcherBase {
       removeRelayListeners();
     };
 
-    // handle subscription events
-    sub.on("event", (ndkEv: NDKEvent) => {
-      tx.send(ndkEv.rawEvent() as NostrEvent);
-    });
-    sub.on("eose", () => {
-      closeSub();
-    });
-
     // auto abortion
     let subAutoAbortTimer: NodeJS.Timer | undefined;
     const resetAutoAbortTimer = () => {
@@ -176,6 +168,15 @@ class NDKAdapter implements NostrFetcherBase {
       closeSub();
     });
 
+    // handle subscription events
+    sub.on("event", (ndkEv: NDKEvent) => {
+      tx.send(ndkEv.rawEvent() as NostrEvent);
+      resetAutoAbortTimer();
+    });
+    sub.on("eose", () => {
+      closeSub();
+    });
+
     // start subscription
     sub.start();
 

diff --git a/packages/adapter-nostr-tools/src/index.ts b/packages/adapter-nostr-tools/src/index.ts
@@ -139,14 +139,6 @@ class SimplePoolExt implements NostrFetcherBase {
       removeRelayListeners();
     };
 
-    // handle subscription events
-    sub.on("event", (ev: NostrEvent) => {
-      tx.send(ev);
-    });
-    sub.on("eose", () => {
-      closeSub();
-    });
-
     // auto abortion
     let subAutoAbortTimer: NodeJS.Timer | undefined;
     const resetAutoAbortTimer = () => {
@@ -171,6 +163,15 @@ class SimplePoolExt implements NostrFetcherBase {
       closeSub();
     });
 
+    // handle subscription events
+    sub.on("event", (ev: NostrEvent) => {
+      tx.send(ev);
+      resetAutoAbortTimer();
+    });
+    sub.on("eose", () => {
+      closeSub();
+    });
+
     return chIter;
   }