From 4f62475a1a807f88ef6e13167db1032939810a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Arturo=20Cabral=20Mej=C3=ADa?=
 <me@ricardocabral.io>
Date: Tue, 17 Jan 2023 18:50:01 -0500
Subject: [PATCH] chore: refactor abortable requests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ricardo Arturo Cabral Mejía <me@ricardocabral.io>
---
 src/handlers/subscribe-message-handler.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/handlers/subscribe-message-handler.ts b/src/handlers/subscribe-message-handler.ts
index f0737c1..cbaef4b 100644
--- a/src/handlers/subscribe-message-handler.ts
+++ b/src/handlers/subscribe-message-handler.ts
@@ -1,4 +1,5 @@
 import { anyPass, equals, isNil, map, propSatisfies, uniqWith } from 'ramda'
+import { addAbortSignal } from 'stream'
 import { pipeline } from 'stream/promises'
 
 import { createEndOfStoredEventsNoticeMessage, createNoticeMessage, createOutgoingEventMessage } from '../utils/messages'
@@ -57,17 +58,16 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable {
 
     const findEvents = this.eventRepository.findByFilters(filters).stream()
 
+    const abortableFintEvents = addAbortSignal(this.abortController.signal, findEvents)
+
     try {
       await pipeline(
-        findEvents,
+        abortableFintEvents,
         streamFilter(propSatisfies(isNil, 'deleted_at')),
         streamMap(toNostrEvent),
         streamFilter(isSubscribedToEvent),
         streamEach(sendEvent),
         streamEnd(sendEOSE),
-        {
-          signal: this.abortController.signal,
-        }
       )
     } catch (error) {
       if (error instanceof Error && error.name === 'AbortError') {
@@ -92,14 +92,14 @@ export class SubscribeMessageHandler implements IMessageHandler, IAbortable {
         return `Duplicate subscription ${subscriptionId}: Ignorning`
     }
 
-    const maxSubscriptions = this.settings().limits.client.subscription.maxSubscriptions
+    const maxSubscriptions = this.settings().limits?.client?.subscription?.maxSubscriptions ?? 0
     if (maxSubscriptions > 0
       && !existingSubscription?.length && subscriptions.size + 1 > maxSubscriptions
     ) {
       return `Too many subscriptions: Number of subscriptions must be less than or equal to ${maxSubscriptions}`
     }
 
-    const maxFilters = this.settings().limits.client.subscription.maxFilters
+    const maxFilters = this.settings().limits?.client?.subscription?.maxFilters ?? 0
     if (maxFilters > 0) {
       if (filters.length > maxFilters) {
         return `Too many filters: Number of filters per susbscription must be less then or equal to ${maxFilters}`