add nip06.

filter.js

@@ -1,27 +0,0 @@
-export function matchFilter(filter, event) {
-  if (filter.id && event.id !== filter.id) return false
-  if (filter.kind && event.kind !== filter.kind) return false
-  if (filter.author && event.pubkey !== filter.author) return false
-  if (filter.authors && filter.authors.indexOf(event.pubkey) === -1)
-    return false
-  if (
-    filter['#e'] &&
-    event.tags.find(([t, v]) => t === 'e' && v === filter['#e']) === null
-  )
-    return false
-  if (
-    filter['#p'] &&
-    event.tags.find(([t, v]) => t === 'p' && v === filter['#p']) === null
-  )
-    return false
-  if (filter.since && event.created_at <= filter.since) return false
-
-  return true
-}
-
-export function matchFilters(filters, event) {
-  for (let i = 0; i < filters.length; i++) {
-    if (matchFilter(filters[i], event)) return true
-  }
-  return false
-}

index.js

@@ -7,7 +7,6 @@ import {
   serializeEvent,
   getEventHash
 } from './event'
-import {matchFilter, matchFilters} from './filter'
 import {makeRandom32, sha256, getPublicKey} from './utils'
 
 export {
@@ -20,7 +19,5 @@ export {
   makeRandom32,
   sha256,
   getPublicKey,
-  getBlankEvent,
+  getBlankEvent
-  matchFilter,
-  matchFilters
 }

nip06.js

@@ -1,5 +1,4 @@
 import createHmac from 'create-hmac'
-import randomBytes from 'randombytes'
 import * as bip39 from 'bip39'
 
 export function privateKeyFromSeed(seed) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-tools",
-  "version": "0.10.2",
+  "version": "0.7.0",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",

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)}, id)
+          relay.sub({filter, cb: event => cb(event, relay.url)})
         ])
     )
 
@@ -29,23 +29,19 @@ export function relayPool(globalPrivateKey) {
     const activeFilters = filter
 
     activeSubscriptions[id] = {
-      sub: ({cb = activeCallback, filter = activeFilters}) => {
+      sub: ({cb = activeCallback, filter = activeFilters}) =>
         Object.entries(subControllers).map(([relayURL, sub]) => [
           relayURL,
           sub.sub({cb, filter}, id)
-        ])
+        ]),
-        return activeSubscriptions[id]
-      },
       addRelay: relay => {
-        subControllers[relay.url] = relay.sub({cb, filter}, id)
+        subControllers[relay.url] = relay.sub({cb, filter})
-        return activeSubscriptions[id]
       },
       removeRelay: relayURL => {
         if (relayURL in subControllers) {
           subControllers[relayURL].unsub()
           if (Object.keys(subControllers).length === 0) unsub()
         }
-        return activeSubscriptions[id]
       },
       unsub: () => {
         Object.values(subControllers).forEach(sub => sub.unsub())

relay.js

@@ -1,7 +1,6 @@
 import 'websocket-polyfill'
 
 import {verifySignature} from './event'
-import {matchFilters} from './filter'
 
 export function normalizeRelayURL(url) {
   let [host, ...qs] = url.split('?')
@@ -14,7 +13,7 @@ export function normalizeRelayURL(url) {
 export function relayConnect(url, onNotice) {
   url = normalizeRelayURL(url)
 
-  var ws, resolveOpen, untilOpen, wasClosed
+  var ws, resolveOpen, untilOpen
   var openSubs = {}
   let attemptNumber = 1
   let nextAttemptSeconds = 1
@@ -35,25 +34,19 @@ export function relayConnect(url, onNotice) {
       resolveOpen()
 
       // restablish old subscriptions
-      if (wasClosed) {
-        wasClosed = false
       for (let channel in openSubs) {
         let filters = openSubs[channel]
         let cb = channels[channel]
         sub({cb, filter: filters}, channel)
       }
     }
-    }
     ws.onerror = () => {
       console.log('error connecting to relay', url)
     }
     ws.onclose = () => {
       resetOpenState()
       attemptNumber++
-      nextAttemptSeconds += attemptNumber ** 3
+      nextAttemptSeconds += attemptNumber
-      if (nextAttemptSeconds > 14400) {
-        nextAttemptSeconds = 14400 // 4 hours
-      }
       console.log(
         `relay ${url} connection closed. reconnecting in ${nextAttemptSeconds} seconds.`
       )
@@ -62,8 +55,6 @@ export function relayConnect(url, onNotice) {
           connect()
         } catch (err) {}
       }, nextAttemptSeconds * 1000)
-
-      wasClosed = true
     }
 
     ws.onmessage = async e => {
@@ -89,13 +80,13 @@ export function relayConnect(url, onNotice) {
           let channel = data[1]
           let event = data[2]
 
-          if (
+          if (await verifySignature(event)) {
-            (await verifySignature(event)) &&
+            if (channels[channel]) {
-            channels[channel] &&
-            matchFilters(openSubs[channel], event)
-          ) {
               channels[channel](event)
             }
+          } else {
+            console.warn('got event with invalid signature from ' + url, event)
+          }
           return
         }
       }
@@ -148,15 +139,12 @@ export function relayConnect(url, onNotice) {
       try {
         await trySend(['EVENT', event])
         statusCallback(0)
-        let {unsub} = relay.sub(
+        let {unsub} = relay.sub({
-          {
           cb: () => {
             statusCallback(1)
           },
           filter: {id: event.id}
-          },
+        })
-          `monitor-${event.id.slice(0, 5)}`
-        )
         setTimeout(unsub, 5000)
       } catch (err) {
         statusCallback(-1)