nostr-tools 0.10.0 → 0.11.0

package/filter.js

@@ -2,15 +2,16 @@ 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.authors && filter.authors.indexOf(event.pubkey) === -1)
+    return false
   if (
     filter['#e'] &&
-    event.tags.find(([t, v]) => t === 'e' && v === filter['#e']) === null
+    !event.tags.find(([t, v]) => t === 'e' && v === filter['#e'])
   )
     return false
   if (
     filter['#p'] &&
-    event.tags.find(([t, v]) => t === 'p' && v === filter['#p']) === null
+    !event.tags.find(([t, v]) => t === 'p' && v === filter['#p'])
   )
     return false
   if (filter.since && event.created_at <= filter.since) return false

package/nip04.js

@@ -1,3 +1,4 @@
+import aes from 'browserify-cipher'
 import {Buffer} from 'buffer'
 import randomBytes from 'randombytes'
 import * as secp256k1 from '@noble/secp256k1'
@@ -7,7 +8,7 @@ export function encrypt(privkey, pubkey, text) {
   const normalizedKey = getOnlyXFromFullSharedSecret(key)
 
   let iv = Uint8Array.from(randomBytes(16))
-  var cipher = crypto.createCipheriv(
+  var cipher = aes.createCipheriv(
     'aes-256-cbc',
     Buffer.from(normalizedKey, 'hex'),
     iv
@@ -22,7 +23,7 @@ export function decrypt(privkey, pubkey, ciphertext, iv) {
   const key = secp256k1.getSharedSecret(privkey, '02' + pubkey)
   const normalizedKey = getOnlyXFromFullSharedSecret(key)
 
-  var decipher = crypto.createDecipheriv(
+  var decipher = aes.createDecipheriv(
     'aes-256-cbc',
     Buffer.from(normalizedKey, 'hex'),
     Buffer.from(iv, 'base64')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-tools",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",
@@ -9,10 +9,11 @@
   "dependencies": {
     "@noble/secp256k1": "^1.3.0",
     "bip39": "^3.0.4",
-    "buffer": "^6.0.3",
-    "create-hmac": "^1.1.7",
+    "browserify-cipher": ">=1",
+    "buffer": ">=5",
+    "create-hmac": ">=1",
     "dns-packet": "^5.2.4",
-    "randombytes": "^2.1.0",
+    "randombytes": ">=2",
     "websocket-polyfill": "^0.0.3"
   },
   "keywords": [

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('?')
@@ -88,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
         }