add missing id arguments.

index.js

@@ -21,5 +21,3 @@ export {
   getPublicKey,
   getBlankEvent
 }
-export * from './nip04'
-export * from './nip05'

nip04.js

@@ -1,11 +1,12 @@
 import {Buffer} from 'buffer'
+import randomBytes from 'randombytes'
 import * as secp256k1 from '@noble/secp256k1'
 
 export function encrypt(privkey, pubkey, text) {
   const key = secp256k1.getSharedSecret(privkey, '02' + pubkey)
   const normalizedKey = getOnlyXFromFullSharedSecret(key)
 
-  let iv = crypto.randomFillSync(new Uint8Array(16))
+  let iv = Uint8Array.from(randomBytes(16))
   var cipher = crypto.createCipheriv(
     'aes-256-cbc',
     Buffer.from(normalizedKey, 'hex'),

nip06.js

@@ -0,0 +1,17 @@
+import createHmac from 'create-hmac'
+import randomBytes from 'randombytes'
+import * as bip39 from 'bip39'
+
+export function privateKeyFromSeed(seed) {
+  let hmac = createHmac('sha512', Buffer.from('Nostr seed', 'utf8'))
+  hmac.update(seed)
+  return hmac.digest().slice(0, 32).toString('hex')
+}
+
+export function seedFromWords(mnemonic) {
+  return bip39.mnemonicToSeedSync(mnemonic)
+}
+
+export function generateSeedWords() {
+  return bip39.entropyToMnemonic(randomBytes(16).toString('hex'))
+}

package.json

@@ -1,18 +1,18 @@
 {
   "name": "nostr-tools",
-  "version": "0.6.4",
+  "version": "0.9.1",
   "description": "Tools for making a Nostr client.",
-  "main": "dist/nostr-tools.esm.min.js",
-  "module": "dist/nostr-tools.esm.min.js",
-  "browser": "dist/nostr-tools.umd.min.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/fiatjaf/nostr-tools.git"
   },
   "dependencies": {
     "@noble/secp256k1": "^1.3.0",
+    "bip39": "^3.0.4",
     "buffer": "^6.0.3",
+    "create-hmac": "^1.1.7",
     "dns-packet": "^5.2.4",
+    "randombytes": "^2.1.0",
     "websocket-polyfill": "^0.0.3"
   },
   "keywords": [
@@ -26,11 +26,5 @@
     "censorship",
     "censorship-resistance",
     "client"
-  ],
+  ]
-  "devDependencies": {
-    "rollup": "^2.61.1"
-  },
-  "scripts": {
-    "prepublish": "rollup -c"
-  }
 }

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)
         ])
     )
 
@@ -29,19 +29,23 @@ 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})
+        subControllers[relay.url] = relay.sub({cb, filter}, id)
+        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

@@ -13,7 +13,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,19 +34,25 @@ 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
+      nextAttemptSeconds += attemptNumber ** 3
+      if (nextAttemptSeconds > 14400) {
+        nextAttemptSeconds = 14400 // 4 hours
+      }
       console.log(
         `relay ${url} connection closed. reconnecting in ${nextAttemptSeconds} seconds.`
       )
@@ -55,6 +61,8 @@ export function relayConnect(url, onNotice) {
           connect()
         } catch (err) {}
       }, nextAttemptSeconds * 1000)
+
+      wasClosed = true
     }
 
     ws.onmessage = async e => {
@@ -84,8 +92,6 @@ export function relayConnect(url, onNotice) {
             if (channels[channel]) {
               channels[channel](event)
             }
-          } else {
-            console.warn('got event with invalid signature from ' + url, event)
           }
           return
         }
@@ -139,12 +145,15 @@ 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)

rollup.config.js

@@ -1,16 +0,0 @@
-import pkg from './package.json'
-
-export default {
-  input: 'index.js',
-  output: [
-    {
-      name: 'nostrtools',
-      file: pkg.browser,
-      format: 'umd'
-    },
-    {
-      file: pkg.module,
-      format: 'es'
-    }
-  ]
-}