small tweaks on relayConnect.

.eslintrc.json

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

event.js

@@ -34,13 +34,13 @@ export function verifySignature(event) {
   if (event.id !== getEventHash(event)) return false
   return verifySchnorr(
     Buffer.from(event.id, 'hex'),
-    Buffer.from(event.pubkey, 'hex')
+    Buffer.from(event.pubkey, 'hex'),
-    Buffer.from(event.sig, 'hex'),
+    Buffer.from(event.sig, 'hex')
   )
 }
 
 export function signEvent(event, key) {
   let eventHash = Buffer.from(getEventHash(event), 'hex')
-  let key = Buffer.from(key, 'hex')
+  let keyB = Buffer.from(key, 'hex')
-  return Buffer.from(signSchnorr(eventHash, key)).toString('hex')
+  return Buffer.from(signSchnorr(eventHash, keyB)).toString('hex')
 }

index.js

@@ -11,6 +11,7 @@ import {
 import {matchFilter, matchFilters} from './filter'
 
 export {
+  generatePrivateKey,
   relayConnect,
   relayPool,
   signEvent,

keys.js

@@ -13,7 +13,7 @@ export function generatePrivateKey() {
 }
 
 export function getPublicKey(privateKey) {
-  return Buffer.from(
+  return Buffer.from(pointFromScalar(Buffer.from(privateKey, 'hex'), true))
-    pointFromScalar(Buffer.from(privateKey, 'hex'), true)
+    .toString('hex')
-  ).toString('hex')
+    .slice(2)
 }

nip06.js

@@ -1,4 +1,3 @@
-import createHmac from 'create-hmac'
 import {wordlist} from 'micro-bip39/wordlists/english'
 import {
   generateMnemonic,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-tools",
-  "version": "0.12.1",
+  "version": "0.12.4",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",
@@ -12,7 +12,6 @@
     "browserify-cipher": ">=1",
     "buffer": ">=5",
     "create-hash": "^1.2.0",
-    "create-hmac": ">=1",
     "dns-packet": "^5.2.4",
     "micro-bip39": "^0.1.3",
     "randombytes": ">=2",
@@ -30,5 +29,9 @@
     "censorship",
     "censorship-resistance",
     "client"
-  ]
+  ],
+  "devDependencies": {
+    "eslint": "^8.5.0",
+    "eslint-plugin-babel": "^5.3.1"
+  }
 }

pool.js

@@ -3,7 +3,6 @@ import {relayConnect, normalizeRelayURL} from './relay'
 
 export function relayPool(globalPrivateKey) {
   const relays = {}
-  const globalSub = []
   const noticeCallbacks = []
 
   function propagateNotice(notice, relayURL) {
@@ -28,29 +27,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())
-        Object.entries(subControllers).map(([relayURL, sub]) => [
+      delete activeSubscriptions[id]
-          relayURL,
+    }
-          sub.sub({cb, filter}, id)
+    const sub = ({cb = activeCallback, filter = activeFilters}) => {
-        ])
+      Object.entries(subControllers).map(([relayURL, sub]) => [
-        return activeSubscriptions[id]
+        relayURL,
-      },
+        sub.sub({cb, filter}, id)
-      addRelay: relay => {
+      ])
-        subControllers[relay.url] = relay.sub({cb, filter}, id)
+      return activeSubscriptions[id]
-        return activeSubscriptions[id]
+    }
-      },
+    const addRelay = relay => {
-      removeRelay: relayURL => {
+      subControllers[relay.url] = relay.sub({cb, filter}, id)
-        if (relayURL in subControllers) {
+      return activeSubscriptions[id]
-          subControllers[relayURL].unsub()
+    }
-          if (Object.keys(subControllers).length === 0) unsub()
+    const removeRelay = relayURL => {
-        }
+      if (relayURL in subControllers) {
-        return activeSubscriptions[id]
+        subControllers[relayURL].unsub()
-      },
+        if (Object.keys(subControllers).length === 0) unsub()
-      unsub: () => {
-        Object.values(subControllers).forEach(sub => sub.unsub())
-        delete activeSubscriptions[id]
       }
+      return activeSubscriptions[id]
+    }
+
+    activeSubscriptions[id] = {
+      sub,
+      unsub,
+      addRelay,
+      removeRelay
     }
 
     return activeSubscriptions[id]

relay.js

@@ -1,3 +1,5 @@
+/* global WebSocket */
+
 import 'websocket-polyfill'
 
 import {verifySignature} from './event'
@@ -11,7 +13,7 @@ export function normalizeRelayURL(url) {
   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()
@@ -144,22 +147,26 @@ export function relayConnect(url, onNotice) {
   return {
     url,
     sub,
-    async publish(event, statusCallback = status => {}) {
+    async publish(event, statusCallback) {
       try {
         await trySend(['EVENT', event])
-        statusCallback(0)
+        if (statusCallback) {
-        let {unsub} = relay.sub(
+          statusCallback(0)
-          {
+          let {unsub} = sub(
-            cb: () => {
+            {
-              statusCallback(1)
+              cb: () => {
+                statusCallback(1)
+                unsub()
+                clearTimeout(willUnsub)
+              },
+              filter: {id: event.id}
             },
-            filter: {id: event.id}
+            `monitor-${event.id.slice(0, 5)}`
-          },
+          )
-          `monitor-${event.id.slice(0, 5)}`
+          let willUnsub = setTimeout(unsub, 5000)
-        )
+        }
-        setTimeout(unsub, 5000)
       } catch (err) {
-        statusCallback(-1)
+        if (statusCallback) statusCallback(-1)
       }
     },
     close() {