nostr-tools 0.8.1 → 0.10.1

package/filter.js

@@ -0,0 +1,26 @@
+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.author.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
+}

package/index.js

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

package/package.json

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

package/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 => {

package/relay.js

@@ -1,6 +1,7 @@
 import 'websocket-polyfill'
 
 import {verifySignature} from './event'
+import {matchFilters} from './filter'
 
 export function normalizeRelayURL(url) {
   let [host, ...qs] = url.split('?')
@@ -13,7 +14,7 @@ export function normalizeRelayURL(url) {
 export function relayConnect(url, onNotice) {
   url = normalizeRelayURL(url)
 
-  var ws, resolveOpen, untilOpen
+  var ws, resolveOpen, untilOpen, wasClosed
   var openSubs = {}
   let attemptNumber = 1
   let nextAttemptSeconds = 1
@@ -34,10 +35,13 @@ export function relayConnect(url, onNotice) {
       resolveOpen()
 
       // restablish old subscriptions
-      for (let channel in openSubs) {
-        let filters = openSubs[channel]
-        let cb = channels[channel]
-        sub({cb, filter: filters}, channel)
+      if (wasClosed) {
+        wasClosed = false
+        for (let channel in openSubs) {
+          let filters = openSubs[channel]
+          let cb = channels[channel]
+          sub({cb, filter: filters}, channel)
+        }
       }
     }
     ws.onerror = () => {
@@ -58,6 +62,8 @@ export function relayConnect(url, onNotice) {
           connect()
         } catch (err) {}
       }, nextAttemptSeconds * 1000)
+
+      wasClosed = true
     }
 
     ws.onmessage = async e => {
@@ -83,10 +89,12 @@ export function relayConnect(url, onNotice) {
           let channel = data[1]
           let event = data[2]
 
-          if (await verifySignature(event)) {
-            if (channels[channel]) {
-              channels[channel](event)
-            }
+          if (
+            (await verifySignature(event)) &&
+            channels[channel] &&
+            matchFilters(openSubs[channel], event)
+          ) {
+            channels[channel](event)
           }
           return
         }
@@ -140,12 +148,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)