From 4f0cae0eb8c3f85a09943cd1d117cb51c2678cf0 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Mon, 13 Dec 2021 21:21:26 -0300
Subject: [PATCH] add missing `id` arguments.

---
 package.json |  2 +-
 pool.js      |  4 ++--
 relay.js     | 13 ++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index eb4d076..47a4a1b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nostr-tools",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",
diff --git a/pool.js b/pool.js
index 6bbec10..ca7d383 100644
--- a/pool.js
+++ b/pool.js
@@ -21,7 +21,7 @@ export function relayPool(globalPrivateKey) {
         .filter(({policy}) => policy.read)
         .map(({relay}) => [
           relay.url,
-          relay.sub({filter, cb: event => cb(event, relay.url)})
+          relay.sub({filter, cb: event => cb(event, relay.url)}, id)
         ])
     )
 
@@ -37,7 +37,7 @@ export function relayPool(globalPrivateKey) {
         return activeSubscriptions[id]
       },
       addRelay: relay => {
-        subControllers[relay.url] = relay.sub({cb, filter})
+        subControllers[relay.url] = relay.sub({cb, filter}, id)
         return activeSubscriptions[id]
       },
       removeRelay: relayURL => {
diff --git a/relay.js b/relay.js
index f994a33..88f4ec5 100644
--- a/relay.js
+++ b/relay.js
@@ -145,12 +145,15 @@ export function relayConnect(url, onNotice) {
       try {
         await trySend(['EVENT', event])
         statusCallback(0)
-        let {unsub} = relay.sub({
-          cb: () => {
-            statusCallback(1)
+        let {unsub} = relay.sub(
+          {
+            cb: () => {
+              statusCallback(1)
+            },
+            filter: {id: event.id}
           },
-          filter: {id: event.id}
-        })
+          `monitor-${event.id.slice(0, 5)}`
+        )
         setTimeout(unsub, 5000)
       } catch (err) {
         statusCallback(-1)