use per-subscription alreadyHaveEvent handler instead of per-relay.

now pools are much smarter.

pool.test.js

@@ -12,18 +12,19 @@ const {
 let p = pool()
 
 let relays = [
-  p.ensureRelay('wss://nostr-dev.wellorder.net/'),
-  p.ensureRelay('wss://relay.nostr.bg/'),
-  p.ensureRelay('wss://nostr.fmt.wiz.biz/'),
-  p.ensureRelay('wss://relay.nostr.band/'),
-  p.ensureRelay('wss://nostr.zebedee.cloud/')
+  'wss://nostr-dev.wellorder.net/',
+  'wss://relay.nostr.bg/',
+  'wss://nostr.fmt.wiz.biz/',
+  'wss://relay.nostr.band/',
+  'wss://nostr.zebedee.cloud/'
 ]
 
 beforeAll(async () => {
   Promise.all(
     relays.map(relay => {
       try {
-        return relay.connect()
+        let r = p.ensureRelay(relay)
+        return r.connect()
       } catch (err) {
         /***/
       }
@@ -34,7 +35,8 @@ beforeAll(async () => {
 afterAll(async () => {
   relays.forEach(relay => {
     try {
-      relay.close()
+      let r = p.ensureRelay(relay)
+      r.close()
     } catch (err) {
       /***/
     }
@@ -45,13 +47,11 @@ test('removing duplicates when querying', async () => {
   let priv = generatePrivateKey()
   let pub = getPublicKey(priv)
 
-  let subs = relays.map(relay =>
-    relay.sub([
-      {
-        authors: [pub]
-      }
-    ])
-  )
+  let subs = p.sub(relays, [
+    {
+      authors: [pub]
+    }
+  ])
 
   let received = []
 
@@ -74,11 +74,46 @@ test('removing duplicates when querying', async () => {
   event.id = getEventHash(event)
   event.sig = signEvent(event, priv)
 
-  relays.forEach(relay => {
-    relay.publish(event)
-  })
+  p.publish(relays, event)
 
   await new Promise(resolve => setTimeout(resolve, 1500))
 
-  return expect(received).toHaveLength(1)
+  expect(received).toHaveLength(1)
+})
+
+test('removing duplicates correctly when double querying', async () => {
+  let priv = generatePrivateKey()
+  let pub = getPublicKey(priv)
+
+  let subs1 = p.sub(relays, [ { authors: [pub] } ])
+  let subs2 = p.sub(relays, [ { authors: [pub] } ])
+
+  let received = []
+
+  subs1.forEach(sub =>
+    sub.on('event', event => {
+      received.push(event)
+    })
+  )
+  subs2.forEach(sub =>
+    sub.on('event', event => {
+      received.push(event)
+    })
+  )
+
+  let event = {
+    pubkey: pub,
+    created_at: Math.round(Date.now() / 1000),
+    content: 'test2',
+    kind: 22346,
+    tags: []
+  }
+  event.id = getEventHash(event)
+  event.sig = signEvent(event, priv)
+
+  p.publish(relays, event)
+
+  await new Promise(resolve => setTimeout(resolve, 1500))
+
+  expect(received).toHaveLength(2)
 })