From 74a0d5454a30eb713ed07c95f67b7b600f72cfa6 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Fri, 23 Dec 2022 15:15:19 -0300
Subject: [PATCH] guard against some nonexisting arrays of event listeners.

---
 package.json |  2 +-
 relay.ts     | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 2fde1bb..d134b8e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nostr-tools",
-  "version": "1.0.0-rc1",
+  "version": "1.0.0-rc2",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",
diff --git a/relay.ts b/relay.ts
index 5ee7162..86ac339 100644
--- a/relay.ts
+++ b/relay.ts
@@ -98,13 +98,13 @@ export function relayInit(url: string): Relay {
                 matchFilters(openSubs[id].filters, event)
               ) {
                 openSubs[id]
-                subListeners[id]?.event.forEach(cb => cb(event))
+                ;(subListeners[id]?.event || []).forEach(cb => cb(event))
               }
               return
             case 'EOSE': {
               if (data.length !== 2) return // ignore empty or malformed EOSE
               let id = data[1]
-              subListeners[id]?.eose.forEach(cb => cb())
+              ;(subListeners[id]?.eose || []).forEach(cb => cb())
               return
             }
             case 'OK': {
@@ -174,8 +174,9 @@ export function relayInit(url: string): Relay {
         subListeners[subid][type].push(cb)
       },
       off: (type: 'event' | 'eose', cb: any): void => {
-        let idx = subListeners[subid][type].indexOf(cb)
-        if (idx >= 0) subListeners[subid][type].splice(idx, 1)
+        let listeners = subListeners[subid]
+        let idx = listeners[type].indexOf(cb)
+        if (idx >= 0) listeners[type].splice(idx, 1)
       }
     }
   }
@@ -221,14 +222,14 @@ export function relayInit(url: string): Relay {
           id: `monitor-${id.slice(0, 5)}`
         })
         let willUnsub = setTimeout(() => {
-          pubListeners[id].failed.forEach(cb =>
+          ;(pubListeners[id]?.failed || []).forEach(cb =>
             cb('event not seen after 5 seconds')
           )
           monitor.unsub()
         }, 5000)
         monitor.on('event', () => {
           clearTimeout(willUnsub)
-          pubListeners[id].seen.forEach(cb => cb())
+          ;(pubListeners[id]?.seen || []).forEach(cb => cb())
         })
       }
 
@@ -247,8 +248,10 @@ export function relayInit(url: string): Relay {
           }
         },
         off: (type: 'ok' | 'seen' | 'failed', cb: any) => {
-          let idx = pubListeners[id][type].indexOf(cb)
-          if (idx >= 0) pubListeners[id][type].splice(idx, 1)
+          let listeners = pubListeners[id]
+          if (!listeners) return
+          let idx = listeners[type].indexOf(cb)
+          if (idx >= 0) listeners[type].splice(idx, 1)
         }
       }
     },