fix .kind filter validator.

.eslintrc.json

@@ -1,4 +1,5 @@
 {
+  "root": true,
   "parserOptions": {
     "ecmaVersion": 9,
     "ecmaFeatures": {

event.js

@@ -1,6 +1,6 @@
 import {Buffer} from 'buffer'
 import createHash from 'create-hash'
-import {signSchnorr, verifySchnorr} from 'tiny-secp256k1'
+import * as secp256k1 from '@noble/secp256k1'
 
 export function getBlankEvent() {
   return {
@@ -18,7 +18,7 @@ export function serializeEvent(evt) {
     evt.pubkey,
     evt.created_at,
     evt.kind,
-    evt.tags || [],
+    evt.tags,
     evt.content
   ])
 }
@@ -30,17 +30,27 @@ export function getEventHash(event) {
   return Buffer.from(eventHash).toString('hex')
 }
 
-export function verifySignature(event) {
+export function validateEvent(event) {
   if (event.id !== getEventHash(event)) return false
-  return verifySchnorr(
+  if (typeof event.content !== 'string') return false
-    Buffer.from(event.id, 'hex'),
+  if (typeof event.created_at !== 'number') return false
-    Buffer.from(event.pubkey, 'hex')
+
-    Buffer.from(event.sig, 'hex'),
+  if (!Array.isArray(event.tags)) return false
-  )
+  for (let i = 0; i < event.tags.length; i++) {
+    let tag = event.tags[i]
+    if (!Array.isArray(tag)) return false
+    for (let j = 0; j < tag.length; j++) {
+      if (typeof tag[j] === 'object') return false
+    }
   }
 
-export function signEvent(event, key) {
+  return true
-  let eventHash = Buffer.from(getEventHash(event), 'hex')
+}
-  let key = Buffer.from(key, 'hex')
+
-  return Buffer.from(signSchnorr(eventHash, key)).toString('hex')
+export function verifySignature(event) {
+  return secp256k1.schnorr.verify(event.sig, event.id, event.pubkey)
+}
+
+export async function signEvent(event, key) {
+  return secp256k1.schnorr.sign(getEventHash(event), key)
 }

filter.js

@@ -1,7 +1,6 @@
 export function matchFilter(filter, event) {
   if (filter.id && event.id !== filter.id) return false
-  if (filter.kind && event.kind !== filter.kind) return false
+  if (typeof filter.kind === 'number' && 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 (

index.js

@@ -4,6 +4,7 @@ import {relayPool} from './pool'
 import {
   getBlankEvent,
   signEvent,
+  validateEvent,
   verifySignature,
   serializeEvent,
   getEventHash
@@ -11,9 +12,11 @@ import {
 import {matchFilter, matchFilters} from './filter'
 
 export {
+  generatePrivateKey,
   relayConnect,
   relayPool,
   signEvent,
+  validateEvent,
   verifySignature,
   serializeEvent,
   getEventHash,

keys.js

@@ -1,19 +1,9 @@
-import randomBytes from 'randombytes'
+import * as secp256k1 from '@noble/secp256k1'
-import {isPrivate, pointFromScalar} from 'tiny-secp256k1'
 
 export function generatePrivateKey() {
-  let i = 8
+  return Buffer.from(secp256k1.utils.randomPrivateKey()).toString('hex')
-  while (i--) {
-    let r32 = Buffer.from(randomBytes(32))
-    if (isPrivate(r32)) return r32.toString('hex')
-  }
-  throw new Error(
-    'Valid private key was not found in 8 iterations. PRNG is broken'
-  )
 }
 
 export function getPublicKey(privateKey) {
-  return Buffer.from(
+  return secp256k1.schnorr.getPublicKey(privateKey)
-    pointFromScalar(Buffer.from(privateKey, 'hex'), true)
-  ).toString('hex')
 }

nip06.js

@@ -1,18 +1,16 @@
-import createHmac from 'create-hmac'
 import {wordlist} from 'micro-bip39/wordlists/english'
 import {
   generateMnemonic,
   mnemonicToSeedSync,
   validateMnemonic
 } from 'micro-bip39'
-import BIP32Factory from 'bip32'
+import {HDKey} from 'micro-bip32'
-import * as ecc from 'tiny-secp256k1'
-
-const bip32 = BIP32Factory(ecc)
 
 export function privateKeyFromSeed(seed) {
-  let root = bip32.fromSeed(Buffer.from(seed, 'hex'))
+  let root = HDKey.fromMasterSeed(Buffer.from(seed, 'hex'))
-  return root.derivePath(`m/44'/1237'/0'/0'`).privateKey.toString('hex')
+  return Buffer.from(root.derive(`m/44'/1237'/0'/0'`).privateKey).toString(
+    'hex'
+  )
 }
 
 export function seedFromWords(mnemonic) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-tools",
-  "version": "0.12.1",
+  "version": "0.15.1",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",
@@ -8,15 +8,13 @@
   },
   "dependencies": {
     "@noble/secp256k1": "^1.3.0",
-    "bip32": "^3.0.1",
     "browserify-cipher": ">=1",
     "buffer": ">=5",
     "create-hash": "^1.2.0",
-    "create-hmac": ">=1",
     "dns-packet": "^5.2.4",
+    "micro-bip32": "^0.1.0",
     "micro-bip39": "^0.1.3",
     "randombytes": ">=2",
-    "tiny-secp256k1": "^2.1.2",
     "websocket-polyfill": "^0.0.3"
   },
   "keywords": [
@@ -30,5 +28,9 @@
     "censorship",
     "censorship-resistance",
     "client"
-  ]
+  ],
+  "devDependencies": {
+    "eslint": "^8.5.0",
+    "eslint-plugin-babel": "^5.3.1"
+  }
 }

pool.js

@@ -1,9 +1,14 @@
 import {getEventHash, signEvent} from './event'
 import {relayConnect, normalizeRelayURL} from './relay'
 
-export function relayPool(globalPrivateKey) {
+export function relayPool() {
+  var globalPrivateKey
+  const poolPolicy = {
+    // setting this to a number will cause events to be published to a random
+    // set of relays only, instead of publishing to all relays all the time
+    randomChoice: null
+  }
   const relays = {}
-  const globalSub = []
   const noticeCallbacks = []
 
   function propagateNotice(notice, relayURL) {
@@ -28,29 +33,34 @@ export function relayPool(globalPrivateKey) {
     const activeCallback = cb
     const activeFilters = filter
 
-    activeSubscriptions[id] = {
+    const unsub = () => {
-      sub: ({cb = activeCallback, filter = activeFilters}) => {
+      Object.values(subControllers).forEach(sub => sub.unsub())
+      delete activeSubscriptions[id]
+    }
+    const sub = ({cb = activeCallback, filter = activeFilters}) => {
       Object.entries(subControllers).map(([relayURL, sub]) => [
         relayURL,
         sub.sub({cb, filter}, id)
       ])
       return activeSubscriptions[id]
-      },
+    }
-      addRelay: relay => {
+    const addRelay = relay => {
       subControllers[relay.url] = relay.sub({cb, filter}, id)
       return activeSubscriptions[id]
-      },
+    }
-      removeRelay: relayURL => {
+    const 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())
-        delete activeSubscriptions[id]
     }
+
+    activeSubscriptions[id] = {
+      sub,
+      unsub,
+      addRelay,
+      removeRelay
     }
 
     return activeSubscriptions[id]
@@ -62,25 +72,32 @@ export function relayPool(globalPrivateKey) {
     setPrivateKey(privateKey) {
       globalPrivateKey = privateKey
     },
-    async addRelay(url, policy = {read: true, write: true}) {
+    setPolicy(key, value) {
+      poolPolicy[key] = value
+    },
+    addRelay(url, policy = {read: true, write: true}) {
       let relayURL = normalizeRelayURL(url)
       if (relayURL in relays) return
 
-      let relay = await relayConnect(url, notice => {
+      let relay = relayConnect(url, notice => {
         propagateNotice(notice, relayURL)
       })
       relays[relayURL] = {relay, policy}
 
+      if (policy.read) {
         Object.values(activeSubscriptions).forEach(subscription =>
           subscription.addRelay(relay)
         )
+      }
 
       return relay
     },
     removeRelay(url) {
       let relayURL = normalizeRelayURL(url)
-      let {relay} = relays[relayURL]
+      let data = relays[relayURL]
-      if (!relay) return
+      if (!data) return
+
+      let {relay} = data
       Object.values(activeSubscriptions).forEach(subscription =>
         subscription.removeRelay(relay)
       )
@@ -95,7 +112,7 @@ export function relayPool(globalPrivateKey) {
       if (index !== -1) noticeCallbacks.splice(index, 1)
     },
     async publish(event, statusCallback = (status, relayURL) => {}) {
-      event.id = await getEventHash(event)
+      event.id = getEventHash(event)
 
       if (!event.sig) {
         event.tags = event.tags || []
@@ -109,18 +126,40 @@ export function relayPool(globalPrivateKey) {
         }
       }
 
-      Object.values(relays)
+      let writeable = Object.values(relays)
         .filter(({policy}) => policy.write)
-        .map(async ({relay}) => {
+        .sort(() => Math.random() - 0.5) // random
+
+      let maxTargets = poolPolicy.randomChoice
+        ? poolPolicy.randomChoice
+        : writeable.length
+
+      let successes = 0
+
+      for (let i = 0; i < writeable.length; i++) {
+        let {relay} = writeable[i]
+
         try {
-            await relay.publish(event, status =>
+          await new Promise(async (resolve, reject) => {
+            try {
+              await relay.publish(event, status => {
                 statusCallback(status, relay.url)
-            )
+                resolve()
+              })
             } catch (err) {
               statusCallback(-1, relay.url)
             }
           })
 
+          successes++
+          if (successes >= maxTargets) {
+            break
+          }
+        } catch (err) {
+          /***/
+        }
+      }
+
       return event
     }
   }

relay.js

@@ -1,17 +1,19 @@
+/* global WebSocket */
+
 import 'websocket-polyfill'
 
-import {verifySignature} from './event'
+import {verifySignature, validateEvent} from './event'
 import {matchFilters} from './filter'
 
 export function normalizeRelayURL(url) {
-  let [host, ...qs] = url.split('?')
+  let [host, ...qs] = url.trim().split('?')
   if (host.slice(0, 4) === 'http') host = 'ws' + host.slice(4)
   if (host.slice(0, 2) !== 'ws') host = 'wss://' + host
   if (host.length && host[host.length - 1] === '/') host = host.slice(0, -1)
   return [host, ...qs].join('?')
 }
 
-export function relayConnect(url, onNotice) {
+export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
   url = normalizeRelayURL(url)
 
   var ws, resolveOpen, untilOpen, wasClosed
@@ -44,8 +46,9 @@ export function relayConnect(url, onNotice) {
         }
       }
     }
-    ws.onerror = () => {
+    ws.onerror = err => {
       console.log('error connecting to relay', url)
+      onError(err)
     }
     ws.onclose = () => {
       resetOpenState()
@@ -90,7 +93,8 @@ export function relayConnect(url, onNotice) {
           let event = data[2]
 
           if (
-            (await verifySignature(event)) &&
+            validateEvent(event) &&
+            verifySignature(event) &&
             channels[channel] &&
             matchFilters(openSubs[channel], event)
           ) {
@@ -144,22 +148,26 @@ export function relayConnect(url, onNotice) {
   return {
     url,
     sub,
-    async publish(event, statusCallback = status => {}) {
+    async publish(event, statusCallback) {
       try {
         await trySend(['EVENT', event])
+        if (statusCallback) {
           statusCallback(0)
-        let {unsub} = relay.sub(
+          let {unsub} = sub(
             {
               cb: () => {
                 statusCallback(1)
+                unsub()
+                clearTimeout(willUnsub)
               },
               filter: {id: event.id}
             },
             `monitor-${event.id.slice(0, 5)}`
           )
-        setTimeout(unsub, 5000)
+          let willUnsub = setTimeout(unsub, 5000)
+        }
       } catch (err) {
-        statusCallback(-1)
+        if (statusCallback) statusCallback(-1)
       }
     },
     close() {