nostr-tools 0.7.1 → 0.9.0

package/package.json

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

package/pool.js

@@ -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})
+        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())

package/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,10 +34,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 = () => {
@@ -46,7 +49,10 @@ export function relayConnect(url, onNotice) {
     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
         }