From b9a966e8a8fd16ba9dc420183882ac26ef82966e Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 04:49:43 +0100
Subject: [PATCH 01/20] Fix parsing error

---
 relays.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/relays.yaml b/relays.yaml
index d642082..21a9279 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -184,7 +184,7 @@ relays:
   - wss://relay.nostr.lu.ke
   - wss://relay.nostrgraph.net
   - wss://private-nostr.v0l.io
-  - wss://relay.nvote.co:443
+  - "wss://relay.nvote.co:443"
   - wss://relay.nostrprotocol.net
   - wss://nostr.itssilvestre.com
   - wss://nostr.whoop.ph

From 173d3e1a1b553062db2a566055003f6489849e7a Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 05:02:36 +0100
Subject: [PATCH 02/20] Add badges, update text and features.

---
 README.md | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index c1c40c6..32c338f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,14 @@
 > this project is alpha! changes are fast and hard. branching model and tests will come with beta. 
 
-# nostr-watch
+# nostr-watch 0.1.0
 
-A client-side nostr network status built with Vue3, [nostr-js](https://github.com/jb55/nostr-js) and [nostr-relay-inspector](https://github.com/dskvr/nostr-relay-inspector). Goal is to produce a client-side app that collects detailed information about nostr relays and the network in general to assist users, developers and relay operators alike
+Production [![production: nostrwatch](https://github.com/dskvr/nostr-watch/actions/workflows/deploy.yml/badge.svg)](https://github.com/dskvr/nostr-watch/actions/workflows/deploy.yml)
+
+Staging [![Netlify Status](https://api.netlify.com/api/v1/badges/d99dd01e-2d30-48df-8fad-2969edaf04fa/deploy-status)](https://app.netlify.com/sites/nostrwatch/deploys)
+
+A client-side nostr network status built with Vue3, Pinia, [nostr-tools](https://github.com/fiatjaf/nostr-tools), [nostr-js](https://github.com/jb55/nostr-js) and [nostr-relay-inspector](https://github.com/dskvr/nostr-relay-inspector). 
+
+nostr.watch aggregates various datapoints nostr relays and the network in general to assist users, developers and relay operators. 
 
 ## Features
 - [x] Real-time relay status 
@@ -13,25 +19,35 @@ A client-side nostr network status built with Vue3, [nostr-js](https://github.co
 - [x] Relay Behavior Analysis
 - [x] NIP Checks
 - [x] Geo Checks (build-time)
-- [ ] Optional Companion Backend for historical data and relay relief, front-end gracefully degrades if inaccessible. 
-- [ ] "Best Relays for a User" and "Best Relays for a Developer" dynamic aggregate, the former based largely on a balance of Latency and NIP support, the latter based largely on NIP support. Unique results for each visitor
+- [x] Favorite Relays 
+- [x] Extension Support 
+- [x] Nostr signing, individualized relay testing 
+- [ ] Lighting Tips to Relay Operators
+- [ ] Relay Statistics 
+- [ ] Relay Historical Data
+- [ ] Discover relays at runtime (currently buildtime, ready to move to runtime with 0.1) 
+- [ ] Discover geo at runtime
 
-## Todo [Road to Beta] 
-- [ ] Expose all features in frontend 
-- [ ] Clean codebase 
-- [ ] Tests
 
 ## Project setup
 ```
 yarn install
 ```
 
+## Pre-build
+
+
 ### Compiles and hot-reloads for development
+Run once or whenever you want to update geo/discover relays 
+```
+yarn prebuild
+```
 ```
 yarn serve
 ```
 
 ### Compiles and minifies for production
+_This runs prebuild every time_
 ```
 yarn build
 ```

From f5305416b41f93fd4e1cf2cd52a366f9e8d2431a Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 05:04:24 +0100
Subject: [PATCH 03/20] Update badge links.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 32c338f..a22aaf0 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 # nostr-watch 0.1.0
 
-Production [![production: nostrwatch](https://github.com/dskvr/nostr-watch/actions/workflows/deploy.yml/badge.svg)](https://github.com/dskvr/nostr-watch/actions/workflows/deploy.yml)
+Production [![production: nostrwatch](https://github.com/dskvr/nostr-watch/actions/workflows/deploy.yml/badge.svg)](https://nostr.watch)
 
-Staging [![Netlify Status](https://api.netlify.com/api/v1/badges/d99dd01e-2d30-48df-8fad-2969edaf04fa/deploy-status)](https://app.netlify.com/sites/nostrwatch/deploys)
+Staging [![Netlify Status](https://api.netlify.com/api/v1/badges/d99dd01e-2d30-48df-8fad-2969edaf04fa/deploy-status)](https://next.nostr.watch)
 
 A client-side nostr network status built with Vue3, Pinia, [nostr-tools](https://github.com/fiatjaf/nostr-tools), [nostr-js](https://github.com/jb55/nostr-js) and [nostr-relay-inspector](https://github.com/dskvr/nostr-relay-inspector). 
 

From 4ed51a57d7d7886a2a03b4442229d04f7a7f721e Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 05:04:55 +0100
Subject: [PATCH 04/20] Add staging link.

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a22aaf0..17772a2 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,12 @@
 
 # nostr-watch 0.1.0
 
-Production [![production: nostrwatch](https://github.com/dskvr/nostr-watch/actions/workflows/deploy.yml/badge.svg)](https://nostr.watch)
-
-Staging [![Netlify Status](https://api.netlify.com/api/v1/badges/d99dd01e-2d30-48df-8fad-2969edaf04fa/deploy-status)](https://next.nostr.watch)
-
 A client-side nostr network status built with Vue3, Pinia, [nostr-tools](https://github.com/fiatjaf/nostr-tools), [nostr-js](https://github.com/jb55/nostr-js) and [nostr-relay-inspector](https://github.com/dskvr/nostr-relay-inspector). 
 
 nostr.watch aggregates various datapoints nostr relays and the network in general to assist users, developers and relay operators. 
 
+Develop branch is deployed to https://next.nostr.watch
+
 ## Features
 - [x] Real-time relay status 
 - [x] Real-time, client-centric latency tests 

From a724814e807ed34664d867885fe78f8c9d18f970 Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 05:13:04 +0100
Subject: [PATCH 05/20] hotfix: remove relays.json for now

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 468a8b9..5d184a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,9 +6,9 @@ COPY . /app/
 
 RUN yarn && yarn build
 
-RUN yarn global add yaml2json
+#RUN yarn global add yaml2json
 
-RUN yaml2json relays.yaml > dist/relays.json
+#RUN yaml2json relays.yaml > dist/relays.json
 
 FROM nginx:stable-alpine as nginx-nostr-relay-registry
 

From e218deaa0bc94efa5c7118c6a8a66d86caa7a9cd Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 06:14:38 +0100
Subject: [PATCH 06/20] Fix isProcessing()

---
 src/components/relays/tasks/RefreshTask.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/relays/tasks/RefreshTask.vue b/src/components/relays/tasks/RefreshTask.vue
index 4aeefe9..1065663 100644
--- a/src/components/relays/tasks/RefreshTask.vue
+++ b/src/components/relays/tasks/RefreshTask.vue
@@ -86,7 +86,7 @@ const localMethods = {
         this.store.tasks.finishProcessing('relays')
       }
 
-      if(!this.store.tasks.isProcessing)
+      if(!this.store.tasks.isProcessing('relays'))
         this.invalidate()
     }, 1000)
   },

From 2501536483fc64a5f12f5fae64f30b0e809f2294 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 07:15:52 +0100
Subject: [PATCH 07/20] add filter logic and debug refresh

---
 relays.yaml                                   | 388 +++++++++---------
 .../relays/blocks/RelaysResultTable.vue       |   2 +-
 .../relays/blocks/RelaysSearchFilter.vue      |  75 +++-
 src/components/relays/nav/RelaysFindNav.vue   |   8 +-
 src/components/relays/pages/RelaysFind.vue    |   2 +-
 src/components/relays/pages/RelaysHome.vue    |   2 +-
 src/components/relays/pages/RelaysSingle.vue  |   2 +-
 src/components/relays/tasks/RefreshTask.vue   |  31 +-
 src/main.js                                   |   2 +
 src/shared/computed.js                        |   2 +-
 src/shared/relays-lib.js                      |  13 +
 src/store/prefs.js                            |  19 +-
 src/store/relays.js                           |   4 +-
 src/store/tasks.js                            |   5 +
 14 files changed, 319 insertions(+), 236 deletions(-)

diff --git a/relays.yaml b/relays.yaml
index 21a9279..0d3502a 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -1,198 +1,198 @@
 relays:
-  - wss://nostr.p2sh.co
-  - wss://nostr.lnprivate.network
-  - wss://relay.nostr.vision
-  - wss://nostr-3.orba.ca
-  - wss://satstacker.cloud
-  - wss://freedom-relay.herokuapp.com/ws
-  - wss://nostr-relay.freeberty.net
-  - wss://nostr-relay.wlvs.space
-  - wss://nostr-relay-dev.wlvs.space
-  - wss://nostr.onsats.org
-  - wss://nostr-relay.untethr.me
-  - wss://nostr-relay.lnmarkets.com
-  - wss://nostr.unknown.place
-  - wss://nostr.semisol.dev
-  - wss://nostr-pub.semisol.dev
-  - wss://nostr-verified.wellorder.net
-  - wss://nostr.drss.io
-  - wss://nostr.rocks
-  - wss://nostr.openchain.fr
-  - wss://nostr.delo.software
-  - wss://relay.nostr.info
-  - wss://relay.nostr.pro
-  - wss://relay.minds.com/nostr/v1/ws
-  - wss://relay.damus.io
-  - wss://nostr.zaprite.io
-  - wss://nostr.oxtr.dev
-  - wss://nostr.ono.re
-  - wss://relay.grunch.dev
-  - wss://relay.cynsar.foundation
-  - wss://nostr-pub.wellorder.net
-  - wss://relay.oldcity-bitcoiners.info
-  - wss://relay.bitid.nz
-  - wss://relay.nostr.xyz
-  - wss://relay.futohq.com
-  - wss://nostr.rdfriedl.com
-  - wss://relay.farscapian.com
-  - wss://astral.ninja
-  - wss://relay.sovereign-stack.org
-  - wss://nostr.sandwich.farm
-  - wss://nostr.zebedee.cloud
-  - wss://nostr-2.zebedee.cloud
-  - wss://nostr.shadownode.org
-  - wss://nostr.nymsrelay.com
-  - wss://expensive-relay.fiatjaf.com
-  - wss://relay.kronkltd.net
-  - wss://relay.r3d.red
-  - wss://relay.valireum.net
-  - wss://nostr.fmt.wiz.biz
-  - wss://nostr.v0l.io
-  - wss://relay.cryptocculture.com
-  - wss://nostr.fly.dev
-  - wss://nostr.nordlysln.net
-  - wss://nostr-relay.gkbrk.com
-  - wss://nostr.zerofeerouting.com
-  - wss://no.str.cr
-  - wss://relay.nostr.ch
-  - wss://rsslay.nostr.net
-  - wss://nostr.cercatrova.me
-  - wss://public.nostr.swissrouting.com
-  - wss://nostr-relay.nonce.academy
-  - wss://nostr.rewardsbunny.com
-  - wss://nostr.slothy.win
-  - wss://nostr-verif.slothy.win
-  - wss://nostr.coinos.io
-  - wss://relay.nostropolis.xyz/websocket
-  - wss://lv01.tater.ninja
-  - wss://nostr-2.orba.ca
-  - wss://nostr.orba.ca
-  - wss://nostr.supremestack.xyz
-  - wss://nostrrelay.com
-  - wss://nostr-01.bolt.observer
-  - wss://nostr.mom
-  - wss://relay.nostr.au
-  - wss://nostr.swiss-enigma.ch
-  - wss://nostr.oooxxx.ml
-  - wss://nostr.yael.at
-  - wss://nostr-relay.trustbtc.org
-  - wss://nostr.namek.link
-  - wss://nostr-relay.wolfandcrow.tech
-  - wss://nostr.8e23.net
-  - wss://nostr.actn.io
-  - wss://relay.sendstr.com
-  - wss://nostr.satsophone.tk
-  - wss://nostr-relay.derekross.me
-  - wss://nostr.jiashanlu.synology.me
-  - wss://nostr.radixrat.com
-  - wss://nostr.shawnyeager.net
-  - wss://relay.dev.kronkltd.net
-  - wss://nostr2.namek.link
-  - wss://nostr-dev.wellorder.net
-  - wss://nostr.mwmdev.com
-  - wss://relay.21spirits.io
-  - wss://nostr-relay.freedomnode.com
-  - wss://relay.minds.io/nostr/v1/ws
-  - wss://wlvs.space
-  - wss://nostr.einundzwanzig.space
-  - wss://nostr.d11n.net
-  - wss://nostr1.tunnelsats.com
-  - wss://nostr.tunnelsats.com
-  - wss://nostr.leximaster.com
-  - wss://nostr.hugo.md
-  - wss://mule.platanito.org
-  - wss://relay.ryzizub.com
-  - wss://nostr.w3ird.tech
-  - wss://nostr.robotechy.com
-  - wss://relay.stoner.com
-  - wss://relay.nostrmoto.xyz
-  - wss://relay.boring.surf
-  - wss://nostr.bongbong.com
-  - wss://nostr.gruntwerk.org
-  - wss://nostr.mado.io
-  - wss://nostr.corebreach.com
-  - wss://nostr.hyperlingo.com
-  - wss://nostr.ethtozero.fr
-  - wss://nostr-relay.digitalmob.ro
-  - wss://relay.nvote.co
-  - wss://jiggytom.ddns.net
-  - wss://nostr.sectiontwo.org
-  - wss://nostr.roundrockbitcoiners.com
-  - wss://nostr.nodeofsven.com
-  - wss://nostr.jimc.me
-  - wss://nostr.utxo.lol
-  - wss://relay.lexingtonbitcoin.org
-  - wss://nostr.mikedilger.com
-  - wss://nostr.f44.dev
-  - wss://relay.nyx.ma
-  - wss://nostr.walletofsatoshi.com
-  - wss://nostr.shmueli.org
-  - wss://wizards.wormrobot.org
-  - wss://nostr.orangepill.dev
-  - wss://paid.no.str.cr
-  - wss://nostr.sovbit.com
-  - wss://nostr.datamagik.com
-  - wss://relay.nostrid.com
-  - wss://nostr1.starbackr.me
-  - wss://nostr-relay.schnitzel.world
-  - wss://relay.nostr.express
-  - wss://sg.qemura.xyz
-  - wss://nostr.formigator.eu
-  - wss://nostr.xpersona.net
-  - wss://relay.n057r.club
-  - wss://nostr.digitalreformation.info
-  - wss://nostr.gromeul.eu
-  - wss://nostr-relay.alekberg.net
-  - wss://nostr2.actn.io
-  - wss://nostr-relay.usebitcoin.space
-  - wss://nostrich.friendship.tw
-  - wss://nostr.mustardnodes.com
-  - wss://nostr-alpha.gruntwerk.org
-  - wss://nostr-relay.australiaeast.cloudapp.azure.com
-  - wss://nostr.bch.ninja
-  - wss://nostr-relay.smoove.net
-  - wss://nostr-relay.j3s7m4n.com
-  - wss://nostr.demovement.net
-  - wss://nostr.thesimplekid.com
-  - wss://nostr.aozing.com
-  - wss://nostr.blocs.fr
-  - wss://no.str.watch
-  - wss://nostr.vulpem.com
-  - wss://btc.klendazu.com
-  - wss://nostr.hackerman.pro
-  - wss://relay.realsearch.cc
-  - wss://nostr.mrbits.it
-  - wss://nostr.coollamer.com
-  - wss://node01.nostress.cc
-  - wss://nostr.zenon.wtf
-  - wss://nostr.massmux.com
-  - wss://no.contry.xyz
-  - wss://relay.nostr.bg
-  - wss://nostr.uselessshit.co
-  - wss://brb.io
-  - wss://nostream.gromeul.eu
-  - wss://relay.nostr.ro
-  - wss://nostr.developer.li
-  - wss://nostr.screaminglife.io
-  - wss://deschooling.us
-  - wss://relay-pub.deschooling.us
-  - wss://nostr.bitcoiner.social
-  - wss://nostr-pub1.southflorida.ninja
-  - wss://nostr.ncsa.illinois.edu
-  - wss://nostr.relayer.se
-  - wss://nostr.noones.com
-  - wss://relay.nostr.lu.ke
-  - wss://relay.nostrgraph.net
-  - wss://private-nostr.v0l.io
-  - "wss://relay.nvote.co:443"
-  - wss://relay.nostrprotocol.net
-  - wss://nostr.itssilvestre.com
-  - wss://nostr.whoop.ph
-  - wss://nostr.zoomout.chat
-  - wss://nostr.chaker.net
-  - wss://nostr-1.nbo.angani.co
-  - wss://nostr3.actn.io
-  - wss://nostr.relayer.se
+  # - wss://nostr.p2sh.co
+  # - wss://nostr.lnprivate.network
+  # - wss://relay.nostr.vision
+  # - wss://nostr-3.orba.ca
+  # - wss://satstacker.cloud
+  # - wss://freedom-relay.herokuapp.com/ws
+  # - wss://nostr-relay.freeberty.net
+  # - wss://nostr-relay.wlvs.space
+  # - wss://nostr-relay-dev.wlvs.space
+  # - wss://nostr.onsats.org
+  # - wss://nostr-relay.untethr.me
+  # - wss://nostr-relay.lnmarkets.com
+  # - wss://nostr.unknown.place
+  # - wss://nostr.semisol.dev
+  # - wss://nostr-pub.semisol.dev
+  # - wss://nostr-verified.wellorder.net
+  # - wss://nostr.drss.io
+  # - wss://nostr.rocks
+  # - wss://nostr.openchain.fr
+  # - wss://nostr.delo.software
+  # - wss://relay.nostr.info
+  # - wss://relay.nostr.pro
+  # - wss://relay.minds.com/nostr/v1/ws
+  # - wss://relay.damus.io
+  # - wss://nostr.zaprite.io
+  # - wss://nostr.oxtr.dev
+  # - wss://nostr.ono.re
+  # - wss://relay.grunch.dev
+  # - wss://relay.cynsar.foundation
+  # - wss://nostr-pub.wellorder.net
+  # - wss://relay.oldcity-bitcoiners.info
+  # - wss://relay.bitid.nz
+  # - wss://relay.nostr.xyz
+  # - wss://relay.futohq.com
+  # - wss://nostr.rdfriedl.com
+  # - wss://relay.farscapian.com
+  # - wss://astral.ninja
+  # - wss://relay.sovereign-stack.org
+  # - wss://nostr.sandwich.farm
+  # - wss://nostr.zebedee.cloud
+  # - wss://nostr-2.zebedee.cloud
+  # - wss://nostr.shadownode.org
+  # - wss://nostr.nymsrelay.com
+  # - wss://expensive-relay.fiatjaf.com
+  # - wss://relay.kronkltd.net
+  # - wss://relay.r3d.red
+  # - wss://relay.valireum.net
+  # - wss://nostr.fmt.wiz.biz
+  # - wss://nostr.v0l.io
+  # - wss://relay.cryptocculture.com
+  # - wss://nostr.fly.dev
+  # - wss://nostr.nordlysln.net
+  # - wss://nostr-relay.gkbrk.com
+  # - wss://nostr.zerofeerouting.com
+  # - wss://no.str.cr
+  # - wss://relay.nostr.ch
+  # - wss://rsslay.nostr.net
+  # - wss://nostr.cercatrova.me
+  # - wss://public.nostr.swissrouting.com
+  # - wss://nostr-relay.nonce.academy
+  # - wss://nostr.rewardsbunny.com
+  # - wss://nostr.slothy.win
+  # - wss://nostr-verif.slothy.win
+  # - wss://nostr.coinos.io
+  # - wss://relay.nostropolis.xyz/websocket
+  # - wss://lv01.tater.ninja
+  # - wss://nostr-2.orba.ca
+  # - wss://nostr.orba.ca
+  # - wss://nostr.supremestack.xyz
+  # - wss://nostrrelay.com
+  # - wss://nostr-01.bolt.observer
+  # - wss://nostr.mom
+  # - wss://relay.nostr.au
+  # - wss://nostr.swiss-enigma.ch
+  # - wss://nostr.oooxxx.ml
+  # - wss://nostr.yael.at
+  # - wss://nostr-relay.trustbtc.org
+  # - wss://nostr.namek.link
+  # - wss://nostr-relay.wolfandcrow.tech
+  # - wss://nostr.8e23.net
+  # - wss://nostr.actn.io
+  # - wss://relay.sendstr.com
+  # - wss://nostr.satsophone.tk
+  # - wss://nostr-relay.derekross.me
+  # - wss://nostr.jiashanlu.synology.me
+  # - wss://nostr.radixrat.com
+  # - wss://nostr.shawnyeager.net
+  # - wss://relay.dev.kronkltd.net
+  # - wss://nostr2.namek.link
+  # - wss://nostr-dev.wellorder.net
+  # - wss://nostr.mwmdev.com
+  # - wss://relay.21spirits.io
+  # - wss://nostr-relay.freedomnode.com
+  # - wss://relay.minds.io/nostr/v1/ws
+  # - wss://wlvs.space
+  # - wss://nostr.einundzwanzig.space
+  # - wss://nostr.d11n.net
+  # - wss://nostr1.tunnelsats.com
+  # - wss://nostr.tunnelsats.com
+  # - wss://nostr.leximaster.com
+  # - wss://nostr.hugo.md
+  # - wss://mule.platanito.org
+  # - wss://relay.ryzizub.com
+  # - wss://nostr.w3ird.tech
+  # - wss://nostr.robotechy.com
+  # - wss://relay.stoner.com
+  # - wss://relay.nostrmoto.xyz
+  # - wss://relay.boring.surf
+  # - wss://nostr.bongbong.com
+  # - wss://nostr.gruntwerk.org
+  # - wss://nostr.mado.io
+  # - wss://nostr.corebreach.com
+  # - wss://nostr.hyperlingo.com
+  # - wss://nostr.ethtozero.fr
+  # - wss://nostr-relay.digitalmob.ro
+  # - wss://relay.nvote.co
+  # - wss://jiggytom.ddns.net
+  # - wss://nostr.sectiontwo.org
+  # - wss://nostr.roundrockbitcoiners.com
+  # - wss://nostr.nodeofsven.com
+  # - wss://nostr.jimc.me
+  # - wss://nostr.utxo.lol
+  # - wss://relay.lexingtonbitcoin.org
+  # - wss://nostr.mikedilger.com
+  # - wss://nostr.f44.dev
+  # - wss://relay.nyx.ma
+  # - wss://nostr.walletofsatoshi.com
+  # - wss://nostr.shmueli.org
+  # - wss://wizards.wormrobot.org
+  # - wss://nostr.orangepill.dev
+  # - wss://paid.no.str.cr
+  # - wss://nostr.sovbit.com
+  # - wss://nostr.datamagik.com
+  # - wss://relay.nostrid.com
+  # - wss://nostr1.starbackr.me
+  # - wss://nostr-relay.schnitzel.world
+  # - wss://relay.nostr.express
+  # - wss://sg.qemura.xyz
+  # - wss://nostr.formigator.eu
+  # - wss://nostr.xpersona.net
+  # - wss://relay.n057r.club
+  # - wss://nostr.digitalreformation.info
+  # - wss://nostr.gromeul.eu
+  # - wss://nostr-relay.alekberg.net
+  # - wss://nostr2.actn.io
+  # - wss://nostr-relay.usebitcoin.space
+  # - wss://nostrich.friendship.tw
+  # - wss://nostr.mustardnodes.com
+  # - wss://nostr-alpha.gruntwerk.org
+  # - wss://nostr-relay.australiaeast.cloudapp.azure.com
+  # - wss://nostr.bch.ninja
+  # - wss://nostr-relay.smoove.net
+  # - wss://nostr-relay.j3s7m4n.com
+  # - wss://nostr.demovement.net
+  # - wss://nostr.thesimplekid.com
+  # - wss://nostr.aozing.com
+  # - wss://nostr.blocs.fr
+  # - wss://no.str.watch
+  # - wss://nostr.vulpem.com
+  # - wss://btc.klendazu.com
+  # - wss://nostr.hackerman.pro
+  # - wss://relay.realsearch.cc
+  # - wss://nostr.mrbits.it
+  # - wss://nostr.coollamer.com
+  # - wss://node01.nostress.cc
+  # - wss://nostr.zenon.wtf
+  # - wss://nostr.massmux.com
+  # - wss://no.contry.xyz
+  # - wss://relay.nostr.bg
+  # - wss://nostr.uselessshit.co
+  # - wss://brb.io
+  # - wss://nostream.gromeul.eu
+  # - wss://relay.nostr.ro
+  # - wss://nostr.developer.li
+  # - wss://nostr.screaminglife.io
+  # - wss://deschooling.us
+  # - wss://relay-pub.deschooling.us
+  # - wss://nostr.bitcoiner.social
+  # - wss://nostr-pub1.southflorida.ninja
+  # - wss://nostr.ncsa.illinois.edu
+  # - wss://nostr.relayer.se
+  # - wss://nostr.noones.com
+  # - wss://relay.nostr.lu.ke
+  # - wss://relay.nostrgraph.net
+  # - wss://private-nostr.v0l.io
+  # - "wss://relay.nvote.co:443"
+  # - wss://relay.nostrprotocol.net
+  # - wss://nostr.itssilvestre.com
+  # - wss://nostr.whoop.ph
+  # - wss://nostr.zoomout.chat
+  # - wss://nostr.chaker.net
+  # - wss://nostr-1.nbo.angani.co
+  # - wss://nostr3.actn.io
+  # - wss://nostr.relayer.se
   - wss://relay.nostr.nu
   - wss://relay.taxi
   - wss://relay.nostrprotocol.net
diff --git a/src/components/relays/blocks/RelaysResultTable.vue b/src/components/relays/blocks/RelaysResultTable.vue
index b4486a2..90d5fe7 100644
--- a/src/components/relays/blocks/RelaysResultTable.vue
+++ b/src/components/relays/blocks/RelaysResultTable.vue
@@ -207,7 +207,7 @@
     },
     computed: {
       subsectionRelays(){
-        return this.sortRelays( this.store.relays.getRelays(this.subsection, this.results ) )
+        return this.getRelays( this.store.relays.getRelays(this.subsection, this.results ) )
       },
       relayGeo(){
         return (relay) => this.store.relays.getGeo(relay)
diff --git a/src/components/relays/blocks/RelaysSearchFilter.vue b/src/components/relays/blocks/RelaysSearchFilter.vue
index 97ca5bb..2303d42 100644
--- a/src/components/relays/blocks/RelaysSearchFilter.vue
+++ b/src/components/relays/blocks/RelaysSearchFilter.vue
@@ -6,6 +6,7 @@
       <MagnifyingGlassIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
     </div>
     <input 
+      ref="relay_filter"
       id="relay-filter" 
       name="relay-filter" 
       placeholder="Filter Relays" type="search"
@@ -13,6 +14,7 @@
       />
   </div>
 </div>
+{{ store.prefs.getFilters }}
 </template>
 
 <script>
@@ -31,7 +33,65 @@ const localMethods = {
   },
   clearData(){
     this.store.relays.clearResults()
-  }
+  },
+  handleKeyUp(){
+
+  },
+  handleFilter(event){
+    this.parseFilter(event.target.value)
+  },
+  parseFilter(string){
+    console.log('parsing', string)
+    const segments = string.split(' ')
+    segments.forEach(segment => {
+      if(segment.includes('nip:'))
+        this.parseNip(segment)
+      else {
+        this.parseRelay(segment)
+      }
+    })
+    console.log(this.store.prefs.getFilters)
+  },
+  parseRelay(maybeRelay){
+    const fn = (relays) => {
+      return relays.filter( relay => relay.includes(maybeRelay))
+    }
+    this.store.prefs.addFilter( 'relay', fn )
+  },
+  parseNip(nip){
+    const data = nip.split(':')
+
+    if(data.length != 2)
+      return 
+
+    const key = data[0],
+          value = data[1]
+
+    key
+    
+    let not = false
+    
+    if(data[1].startsWith('!'))
+      not = true
+
+    const fn = (relays) => {
+       return relays.filter( relay => {
+        const exists = this.result?.[relay]?.info?.supported_nips.includes(value)
+        return not ? !exists : exists 
+      })
+    }
+    
+    this.store.prefs.addFilter( 'relay', fn )
+  },
+  filterNip(){
+    
+  },
+  filterCountry(){
+
+  },
+  filterContinent(){
+
+  } 
 }
 
 export default defineComponent({
@@ -44,7 +104,12 @@ export default defineComponent({
       store : setupStore()
     }
   },
+  created(){
+  },
   mounted(){
+    console.log('relay_filter ref', this.$refs.relay_filter)
+    this.$refs.relay_filter.addEventListener('change', event => this.handleFilter(event))
+
     // this.preferences = this
   },
   updated(){
@@ -55,13 +120,7 @@ export default defineComponent({
   props: {},
   data() {
     return {
-      storage: null,
-      refresh: true,
-      preferences: {
-        refresh: true,
-        cacheExpiration: 30*60*1000
-      },
-      isActive: false,
+      activeFilters: {}
     }
   },
 })
diff --git a/src/components/relays/nav/RelaysFindNav.vue b/src/components/relays/nav/RelaysFindNav.vue
index c830a00..98eb0af 100644
--- a/src/components/relays/nav/RelaysFindNav.vue
+++ b/src/components/relays/nav/RelaysFindNav.vue
@@ -14,9 +14,9 @@
           </a>
         </div>
       </div>
-      <!-- <div class="flex flex-1 items-center justify-center px-2 lg:ml-6 lg:justify-end">
+      <div class="flex flex-1 items-center justify-center px-2 lg:ml-6 lg:justify-end">
         <RelaysSearchFilter />
-      </div> -->
+      </div>
       <div class="flex items-center lg:hidden">
         <!-- Mobile menu button -->
         <DisclosureButton class="inline-flex items-center justify-center rounded-md p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-indigo-500">
@@ -52,7 +52,7 @@ import { defineComponent } from 'vue'
 //pinia
 import { setupStore } from '@/store'
 //components 
-// import RelaysSearchFilter from '@/components/relays/blocks/RelaysSearchFilter.vue'
+import RelaysSearchFilter from '@/components/relays/blocks/RelaysSearchFilter.vue'
 //nav conf
 import { items } from './config/relays.find.yaml'
 //shared methods 
@@ -67,7 +67,7 @@ export default defineComponent({
 title: "nostr.watch registry & network status",
 name: 'RelaysFindNav',
 components: {
-  // RelaysSearchFilter,
+  RelaysSearchFilter,
   Disclosure, DisclosureButton, DisclosurePanel,
   Bars3Icon, XMarkIcon,
   // PreferencesComponent,
diff --git a/src/components/relays/pages/RelaysFind.vue b/src/components/relays/pages/RelaysFind.vue
index 9d986e4..65423f0 100644
--- a/src/components/relays/pages/RelaysFind.vue
+++ b/src/components/relays/pages/RelaysFind.vue
@@ -140,7 +140,7 @@ export default defineComponent({
     this.store.relays.setGeo(geo)
     
     this.relays = this.store.relays.getAll
-    this.lastUpdate = this.store.relays.lastUpdate
+    this.lastUpdate = this.store.tasks.getLastUpdate('relays')
     this.preferences = this.store.prefs.get
   },
 
diff --git a/src/components/relays/pages/RelaysHome.vue b/src/components/relays/pages/RelaysHome.vue
index e644f18..d78b60e 100644
--- a/src/components/relays/pages/RelaysHome.vue
+++ b/src/components/relays/pages/RelaysHome.vue
@@ -47,7 +47,7 @@ const localMethods = {
     this.store.relays.setGeo(geo)
 
     this.relays = this.store.relays.getAll
-    this.lastUpdate = this.store.relays.lastUpdate
+    this.lastUpdate = this.store.tasks.getLastUpdate('relays')
     this.preferences = this.store.prefs.get
 
     // this.relays.forEach(relay => {
diff --git a/src/components/relays/pages/RelaysSingle.vue b/src/components/relays/pages/RelaysSingle.vue
index fa8e980..a908535 100644
--- a/src/components/relays/pages/RelaysSingle.vue
+++ b/src/components/relays/pages/RelaysSingle.vue
@@ -697,7 +697,7 @@ export default defineComponent({
     setData(){
       this.relay = this.relayFromUrl
       this.relays = this.store.relays.getAggregateCache('public')
-      this.lastUpdate = this.store.relays.getLastUpdate
+      this.lastUpdate = this.store.tasks.getLastUpdate('relays')
       this.result = this.getCache(this.relay) || false
       //
       //console.log('single result', this.relayFromUrl, this.result, this.getCache(this.relay))
diff --git a/src/components/relays/tasks/RefreshTask.vue b/src/components/relays/tasks/RefreshTask.vue
index 4aeefe9..ccd4f5e 100644
--- a/src/components/relays/tasks/RefreshTask.vue
+++ b/src/components/relays/tasks/RefreshTask.vue
@@ -23,8 +23,6 @@
   </button>
 </template>
 
-
-
 <style scoped>
 
 </style>
@@ -82,11 +80,11 @@ const localMethods = {
       this.sinceLast = this.timeSinceRefresh()
 
       if(this.store.tasks.getProcessed('relays').length >= this.relays.length){
-        this.store.relays.updateNow()
+        this.store.relays.updateNow('relays')
         this.store.tasks.finishProcessing('relays')
       }
 
-      if(!this.store.tasks.isProcessing)
+      if(!this.store.tasks.isProcessing('relays'))
         this.invalidate()
     }, 1000)
   },
@@ -102,17 +100,12 @@ const localMethods = {
     if(this.windowActive) 
       this.store.layout.setActiveTab(this.$tabId)
   },
-  // handleRelaysFind(){
-  //   this.addToQueue('relays/find', () => this.invalidate())  
-  // },
-  // handleRelaysSingle(relayURL){
-  //   this.addToQueue('relays/single', () => this.invalidate(false, relayUrl))  
-  // },
+
   invalidate: async function(force, single){
-    //console.log('invalidate()', this.relays.length, force || this.isExpired )
     if( (!this.isExpired && !force) ) 
       return
 
+    console.log('windowActive', this.windowActive)
     if(!this.windowActive)
       return
 
@@ -127,15 +120,11 @@ const localMethods = {
       await this.check(single)
     } 
     else {
-      //console.log('multiple relays',  single)
-      // const processed = new Set()
       for(let index = 0; index < relays.length; index++) {
-        const relay = relays[index]
-        //console.log('checking relay', relay)
         await this.delay(this.averageLatency)
+        const relay = relays[index]
         this.check(relay)
           .then((result) => {
-            //console.log('check completed', relay)
             if(this.store.tasks.isProcessed('relays', relay))
               return 
             
@@ -160,7 +149,7 @@ const localMethods = {
   completeAll: function(){
     //console.log('completed')
     this.store.tasks.finishProcessing('relays')
-    this.store.relays.updateNow()
+    this.store.relays.updateNow('relays')
     this.store.relays.setAggregateCache('public', Object.keys(this.results).filter( result => this.results[result].aggregate === 'public' ))
     this.store.relays.setAggregateCache('restricted', Object.keys(this.results).filter( result => this.results[result].aggregate === 'restricted' ))
     this.store.relays.setAggregateCache('offline', Object.keys(this.results).filter( result => this.results[result].aggregate === 'offline' ))
@@ -169,8 +158,6 @@ const localMethods = {
   },
 
   check: async function(relay){
-    console.log('this should only appear once per second')
-        
     return new Promise( (resolve, reject) => {
       const opts = {
           checkLatency: true,          
@@ -220,10 +207,10 @@ const localMethods = {
     return Math.floor(parseFloat(sum/total));
   },
   timeUntilRefresh(){
-    return this.timeSince(Date.now()-(this.store.relays.lastUpdate+this.store.prefs.duration-Date.now())) 
+    return this.timeSince(Date.now()-(this.store.tasks.getLastUpdate('relays')+this.store.prefs.duration-Date.now())) 
   },
   timeSinceRefresh(){
-    return this.timeSince(this.store.relays.getLastUpdate) || Date.now()
+    return this.timeSince(this.store.tasks.getLastUpdate('relays')) || Date.now()
   },
 }
 
@@ -258,7 +245,7 @@ export default defineComponent({
     // document.removeEventListener("visibilitychange", this.handleVisibility, false);
   },
   beforeMount(){
-    this.lastUpdate = this.store.relays.lastUpdate
+    this.lastUpdate = this.store.tasks.getLastUpdate('relays')
     this.untilNext = this.timeUntilRefresh()
     this.sinceLast = this.timeSinceRefresh()
     
diff --git a/src/main.js b/src/main.js
index 6dd19c6..6320379 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,6 +26,8 @@ directives(app);
 
 app.config.globalProperties.$tabId = crypto.randomBytes(40).toString('hex')
 
+app.config.globalProperties.$filters = []
+
 // app.config.globalProperties.$pool = new RelayPool(relays, {reconnect: false})
 app.config.globalProperties.$pool = new RelayPool(['wss://relay.nostr.ch'])
 
diff --git a/src/shared/computed.js b/src/shared/computed.js
index 712f465..cca2f96 100644
--- a/src/shared/computed.js
+++ b/src/shared/computed.js
@@ -1,5 +1,5 @@
 export default {
     isExpired: function(){
-        return !this.store.relays.getLastUpdate || Date.now() - this.store.relays.getLastUpdate > this.store.prefs.expireAfter
+        return !this.store.tasks.getLastUpdate('relays') || Date.now() - this.store.tasks.getLastUpdate('relays') > this.store.prefs.expireAfter
     },
 }
\ No newline at end of file
diff --git a/src/shared/relays-lib.js b/src/shared/relays-lib.js
index 5c1aecd..f6224f6 100644
--- a/src/shared/relays-lib.js
+++ b/src/shared/relays-lib.js
@@ -2,6 +2,19 @@ import crypto from "crypto"
 import {sort} from 'array-timsort'
 
 export default {
+  getRelays(relays){
+    relays = this.filterRelays(relays)
+    relays = this.sortRelays(relays)
+    return relays
+  },
+  filterRelays(relays){
+    const fns = this.store.prefs.getFilters
+    fns.forEach( fn => {
+      if(fn instanceof Function)
+        relays = fn(relays)
+    })
+    return relays
+  },
   sortRelays(relays){
     sort(relays, (relay1, relay2) => {
       let a = this.results?.[relay1]?.latency.final || 100000,
diff --git a/src/store/prefs.js b/src/store/prefs.js
index 278606f..bb3ecc5 100644
--- a/src/store/prefs.js
+++ b/src/store/prefs.js
@@ -5,13 +5,16 @@ export const usePrefsStore = defineStore('prefs', {
     refresh: true,
     duration: 30*60*1000,
     pinFavorites: true,
-    rowTheme: 'comfortable'
+    rowTheme: 'comfortable',
+    filters: [],
+    filterFn: [],
   }),
   getters: {
     doRefresh: (state) => state.refresh,
     expireAfter: (state) => state.duration,
     doPinFavorites: (state) => state.pinFavorites,
     getTheme: (state) => state.rowTheme,
+    getFilters: (state) => state.filterFn,
   },
   actions: {
     enable(){ this.refresh = true },
@@ -20,5 +23,19 @@ export const usePrefsStore = defineStore('prefs', {
     updateExpiration(dur) { this.duration = dur },
     togglePinFavorites(){ this.pinFavorites = !this.pinFavorites },
     changeTheme(theme){ this.rowTheme = theme },
+    addFilter(key, fn){ 
+      if(this.filters.includes(key))
+        return 
+      this.filters.push(key)
+      this.filterFn.push(fn) 
+      console.log('functions:', this.filterFn)
+    }
+  },
+},
+{
+  persistedState: {
+    // excludePathts: ['activeFilters']
+    includePaths: ['refresh', 'duration', 'pinFavorites', 'rowTheme', 'filters']
+    // store options goes here
   },
 })
\ No newline at end of file
diff --git a/src/store/relays.js b/src/store/relays.js
index 8fd644b..d7c4c39 100644
--- a/src/store/relays.js
+++ b/src/store/relays.js
@@ -7,7 +7,7 @@ export const useRelaysStore = defineStore('relays', {
     urls: new Array(),
     // results: new Object(),
     geo: new Object(),
-    lastUpdate: null,
+    lastUpdate: {},
     count: new Object(),
     processing: false,
     processedRelays: new Set(),
@@ -62,7 +62,7 @@ export const useRelaysStore = defineStore('relays', {
 
     setGeo(geo){ this.geo = geo },
 
-    updateNow(){ this.lastUpdate = Date.now() },
+    updateNow(key){ this.lastUpdate[key] = Date.now() },
 
     setStat(type, value){ 
       this.count[type] = value 
diff --git a/src/store/tasks.js b/src/store/tasks.js
index 134070c..1921fb7 100644
--- a/src/store/tasks.js
+++ b/src/store/tasks.js
@@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
 
 export const useTaskStore = defineStore('tasks', {
   state: () => ({ 
+    lastUpdate: new Object(),
+
     //queue
     pending: new Array(),
     completed: new Array(),
@@ -13,6 +15,8 @@ export const useTaskStore = defineStore('tasks', {
     currentTask: new Object(),
   }),
   getters: {
+    getLastUpdate: (state) => (key) => state.lastUpdate[key],
+
     //legacy 
     getProcessed: (state) => (key) => {
       if( !(state.processed[key] instanceof Array) )
@@ -36,6 +40,7 @@ export const useTaskStore = defineStore('tasks', {
     // getRate: (state) => (key) => state.rate[key],
   },
   actions: {
+    updateNow(key){ this.lastUpdate[key] = Date.now() },
     //queue
     addJob(job){
       this.pending.push(job)

From 25091dcc9ac537477f2ab55f3f67ced65f6068a6 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 07:21:36 +0100
Subject: [PATCH 08/20] fix refresh

---
 relays.yaml                                 | 388 ++++++++++----------
 src/components/relays/tasks/RefreshTask.vue |   5 +-
 2 files changed, 197 insertions(+), 196 deletions(-)

diff --git a/relays.yaml b/relays.yaml
index 0d3502a..21a9279 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -1,198 +1,198 @@
 relays:
-  # - wss://nostr.p2sh.co
-  # - wss://nostr.lnprivate.network
-  # - wss://relay.nostr.vision
-  # - wss://nostr-3.orba.ca
-  # - wss://satstacker.cloud
-  # - wss://freedom-relay.herokuapp.com/ws
-  # - wss://nostr-relay.freeberty.net
-  # - wss://nostr-relay.wlvs.space
-  # - wss://nostr-relay-dev.wlvs.space
-  # - wss://nostr.onsats.org
-  # - wss://nostr-relay.untethr.me
-  # - wss://nostr-relay.lnmarkets.com
-  # - wss://nostr.unknown.place
-  # - wss://nostr.semisol.dev
-  # - wss://nostr-pub.semisol.dev
-  # - wss://nostr-verified.wellorder.net
-  # - wss://nostr.drss.io
-  # - wss://nostr.rocks
-  # - wss://nostr.openchain.fr
-  # - wss://nostr.delo.software
-  # - wss://relay.nostr.info
-  # - wss://relay.nostr.pro
-  # - wss://relay.minds.com/nostr/v1/ws
-  # - wss://relay.damus.io
-  # - wss://nostr.zaprite.io
-  # - wss://nostr.oxtr.dev
-  # - wss://nostr.ono.re
-  # - wss://relay.grunch.dev
-  # - wss://relay.cynsar.foundation
-  # - wss://nostr-pub.wellorder.net
-  # - wss://relay.oldcity-bitcoiners.info
-  # - wss://relay.bitid.nz
-  # - wss://relay.nostr.xyz
-  # - wss://relay.futohq.com
-  # - wss://nostr.rdfriedl.com
-  # - wss://relay.farscapian.com
-  # - wss://astral.ninja
-  # - wss://relay.sovereign-stack.org
-  # - wss://nostr.sandwich.farm
-  # - wss://nostr.zebedee.cloud
-  # - wss://nostr-2.zebedee.cloud
-  # - wss://nostr.shadownode.org
-  # - wss://nostr.nymsrelay.com
-  # - wss://expensive-relay.fiatjaf.com
-  # - wss://relay.kronkltd.net
-  # - wss://relay.r3d.red
-  # - wss://relay.valireum.net
-  # - wss://nostr.fmt.wiz.biz
-  # - wss://nostr.v0l.io
-  # - wss://relay.cryptocculture.com
-  # - wss://nostr.fly.dev
-  # - wss://nostr.nordlysln.net
-  # - wss://nostr-relay.gkbrk.com
-  # - wss://nostr.zerofeerouting.com
-  # - wss://no.str.cr
-  # - wss://relay.nostr.ch
-  # - wss://rsslay.nostr.net
-  # - wss://nostr.cercatrova.me
-  # - wss://public.nostr.swissrouting.com
-  # - wss://nostr-relay.nonce.academy
-  # - wss://nostr.rewardsbunny.com
-  # - wss://nostr.slothy.win
-  # - wss://nostr-verif.slothy.win
-  # - wss://nostr.coinos.io
-  # - wss://relay.nostropolis.xyz/websocket
-  # - wss://lv01.tater.ninja
-  # - wss://nostr-2.orba.ca
-  # - wss://nostr.orba.ca
-  # - wss://nostr.supremestack.xyz
-  # - wss://nostrrelay.com
-  # - wss://nostr-01.bolt.observer
-  # - wss://nostr.mom
-  # - wss://relay.nostr.au
-  # - wss://nostr.swiss-enigma.ch
-  # - wss://nostr.oooxxx.ml
-  # - wss://nostr.yael.at
-  # - wss://nostr-relay.trustbtc.org
-  # - wss://nostr.namek.link
-  # - wss://nostr-relay.wolfandcrow.tech
-  # - wss://nostr.8e23.net
-  # - wss://nostr.actn.io
-  # - wss://relay.sendstr.com
-  # - wss://nostr.satsophone.tk
-  # - wss://nostr-relay.derekross.me
-  # - wss://nostr.jiashanlu.synology.me
-  # - wss://nostr.radixrat.com
-  # - wss://nostr.shawnyeager.net
-  # - wss://relay.dev.kronkltd.net
-  # - wss://nostr2.namek.link
-  # - wss://nostr-dev.wellorder.net
-  # - wss://nostr.mwmdev.com
-  # - wss://relay.21spirits.io
-  # - wss://nostr-relay.freedomnode.com
-  # - wss://relay.minds.io/nostr/v1/ws
-  # - wss://wlvs.space
-  # - wss://nostr.einundzwanzig.space
-  # - wss://nostr.d11n.net
-  # - wss://nostr1.tunnelsats.com
-  # - wss://nostr.tunnelsats.com
-  # - wss://nostr.leximaster.com
-  # - wss://nostr.hugo.md
-  # - wss://mule.platanito.org
-  # - wss://relay.ryzizub.com
-  # - wss://nostr.w3ird.tech
-  # - wss://nostr.robotechy.com
-  # - wss://relay.stoner.com
-  # - wss://relay.nostrmoto.xyz
-  # - wss://relay.boring.surf
-  # - wss://nostr.bongbong.com
-  # - wss://nostr.gruntwerk.org
-  # - wss://nostr.mado.io
-  # - wss://nostr.corebreach.com
-  # - wss://nostr.hyperlingo.com
-  # - wss://nostr.ethtozero.fr
-  # - wss://nostr-relay.digitalmob.ro
-  # - wss://relay.nvote.co
-  # - wss://jiggytom.ddns.net
-  # - wss://nostr.sectiontwo.org
-  # - wss://nostr.roundrockbitcoiners.com
-  # - wss://nostr.nodeofsven.com
-  # - wss://nostr.jimc.me
-  # - wss://nostr.utxo.lol
-  # - wss://relay.lexingtonbitcoin.org
-  # - wss://nostr.mikedilger.com
-  # - wss://nostr.f44.dev
-  # - wss://relay.nyx.ma
-  # - wss://nostr.walletofsatoshi.com
-  # - wss://nostr.shmueli.org
-  # - wss://wizards.wormrobot.org
-  # - wss://nostr.orangepill.dev
-  # - wss://paid.no.str.cr
-  # - wss://nostr.sovbit.com
-  # - wss://nostr.datamagik.com
-  # - wss://relay.nostrid.com
-  # - wss://nostr1.starbackr.me
-  # - wss://nostr-relay.schnitzel.world
-  # - wss://relay.nostr.express
-  # - wss://sg.qemura.xyz
-  # - wss://nostr.formigator.eu
-  # - wss://nostr.xpersona.net
-  # - wss://relay.n057r.club
-  # - wss://nostr.digitalreformation.info
-  # - wss://nostr.gromeul.eu
-  # - wss://nostr-relay.alekberg.net
-  # - wss://nostr2.actn.io
-  # - wss://nostr-relay.usebitcoin.space
-  # - wss://nostrich.friendship.tw
-  # - wss://nostr.mustardnodes.com
-  # - wss://nostr-alpha.gruntwerk.org
-  # - wss://nostr-relay.australiaeast.cloudapp.azure.com
-  # - wss://nostr.bch.ninja
-  # - wss://nostr-relay.smoove.net
-  # - wss://nostr-relay.j3s7m4n.com
-  # - wss://nostr.demovement.net
-  # - wss://nostr.thesimplekid.com
-  # - wss://nostr.aozing.com
-  # - wss://nostr.blocs.fr
-  # - wss://no.str.watch
-  # - wss://nostr.vulpem.com
-  # - wss://btc.klendazu.com
-  # - wss://nostr.hackerman.pro
-  # - wss://relay.realsearch.cc
-  # - wss://nostr.mrbits.it
-  # - wss://nostr.coollamer.com
-  # - wss://node01.nostress.cc
-  # - wss://nostr.zenon.wtf
-  # - wss://nostr.massmux.com
-  # - wss://no.contry.xyz
-  # - wss://relay.nostr.bg
-  # - wss://nostr.uselessshit.co
-  # - wss://brb.io
-  # - wss://nostream.gromeul.eu
-  # - wss://relay.nostr.ro
-  # - wss://nostr.developer.li
-  # - wss://nostr.screaminglife.io
-  # - wss://deschooling.us
-  # - wss://relay-pub.deschooling.us
-  # - wss://nostr.bitcoiner.social
-  # - wss://nostr-pub1.southflorida.ninja
-  # - wss://nostr.ncsa.illinois.edu
-  # - wss://nostr.relayer.se
-  # - wss://nostr.noones.com
-  # - wss://relay.nostr.lu.ke
-  # - wss://relay.nostrgraph.net
-  # - wss://private-nostr.v0l.io
-  # - "wss://relay.nvote.co:443"
-  # - wss://relay.nostrprotocol.net
-  # - wss://nostr.itssilvestre.com
-  # - wss://nostr.whoop.ph
-  # - wss://nostr.zoomout.chat
-  # - wss://nostr.chaker.net
-  # - wss://nostr-1.nbo.angani.co
-  # - wss://nostr3.actn.io
-  # - wss://nostr.relayer.se
+  - wss://nostr.p2sh.co
+  - wss://nostr.lnprivate.network
+  - wss://relay.nostr.vision
+  - wss://nostr-3.orba.ca
+  - wss://satstacker.cloud
+  - wss://freedom-relay.herokuapp.com/ws
+  - wss://nostr-relay.freeberty.net
+  - wss://nostr-relay.wlvs.space
+  - wss://nostr-relay-dev.wlvs.space
+  - wss://nostr.onsats.org
+  - wss://nostr-relay.untethr.me
+  - wss://nostr-relay.lnmarkets.com
+  - wss://nostr.unknown.place
+  - wss://nostr.semisol.dev
+  - wss://nostr-pub.semisol.dev
+  - wss://nostr-verified.wellorder.net
+  - wss://nostr.drss.io
+  - wss://nostr.rocks
+  - wss://nostr.openchain.fr
+  - wss://nostr.delo.software
+  - wss://relay.nostr.info
+  - wss://relay.nostr.pro
+  - wss://relay.minds.com/nostr/v1/ws
+  - wss://relay.damus.io
+  - wss://nostr.zaprite.io
+  - wss://nostr.oxtr.dev
+  - wss://nostr.ono.re
+  - wss://relay.grunch.dev
+  - wss://relay.cynsar.foundation
+  - wss://nostr-pub.wellorder.net
+  - wss://relay.oldcity-bitcoiners.info
+  - wss://relay.bitid.nz
+  - wss://relay.nostr.xyz
+  - wss://relay.futohq.com
+  - wss://nostr.rdfriedl.com
+  - wss://relay.farscapian.com
+  - wss://astral.ninja
+  - wss://relay.sovereign-stack.org
+  - wss://nostr.sandwich.farm
+  - wss://nostr.zebedee.cloud
+  - wss://nostr-2.zebedee.cloud
+  - wss://nostr.shadownode.org
+  - wss://nostr.nymsrelay.com
+  - wss://expensive-relay.fiatjaf.com
+  - wss://relay.kronkltd.net
+  - wss://relay.r3d.red
+  - wss://relay.valireum.net
+  - wss://nostr.fmt.wiz.biz
+  - wss://nostr.v0l.io
+  - wss://relay.cryptocculture.com
+  - wss://nostr.fly.dev
+  - wss://nostr.nordlysln.net
+  - wss://nostr-relay.gkbrk.com
+  - wss://nostr.zerofeerouting.com
+  - wss://no.str.cr
+  - wss://relay.nostr.ch
+  - wss://rsslay.nostr.net
+  - wss://nostr.cercatrova.me
+  - wss://public.nostr.swissrouting.com
+  - wss://nostr-relay.nonce.academy
+  - wss://nostr.rewardsbunny.com
+  - wss://nostr.slothy.win
+  - wss://nostr-verif.slothy.win
+  - wss://nostr.coinos.io
+  - wss://relay.nostropolis.xyz/websocket
+  - wss://lv01.tater.ninja
+  - wss://nostr-2.orba.ca
+  - wss://nostr.orba.ca
+  - wss://nostr.supremestack.xyz
+  - wss://nostrrelay.com
+  - wss://nostr-01.bolt.observer
+  - wss://nostr.mom
+  - wss://relay.nostr.au
+  - wss://nostr.swiss-enigma.ch
+  - wss://nostr.oooxxx.ml
+  - wss://nostr.yael.at
+  - wss://nostr-relay.trustbtc.org
+  - wss://nostr.namek.link
+  - wss://nostr-relay.wolfandcrow.tech
+  - wss://nostr.8e23.net
+  - wss://nostr.actn.io
+  - wss://relay.sendstr.com
+  - wss://nostr.satsophone.tk
+  - wss://nostr-relay.derekross.me
+  - wss://nostr.jiashanlu.synology.me
+  - wss://nostr.radixrat.com
+  - wss://nostr.shawnyeager.net
+  - wss://relay.dev.kronkltd.net
+  - wss://nostr2.namek.link
+  - wss://nostr-dev.wellorder.net
+  - wss://nostr.mwmdev.com
+  - wss://relay.21spirits.io
+  - wss://nostr-relay.freedomnode.com
+  - wss://relay.minds.io/nostr/v1/ws
+  - wss://wlvs.space
+  - wss://nostr.einundzwanzig.space
+  - wss://nostr.d11n.net
+  - wss://nostr1.tunnelsats.com
+  - wss://nostr.tunnelsats.com
+  - wss://nostr.leximaster.com
+  - wss://nostr.hugo.md
+  - wss://mule.platanito.org
+  - wss://relay.ryzizub.com
+  - wss://nostr.w3ird.tech
+  - wss://nostr.robotechy.com
+  - wss://relay.stoner.com
+  - wss://relay.nostrmoto.xyz
+  - wss://relay.boring.surf
+  - wss://nostr.bongbong.com
+  - wss://nostr.gruntwerk.org
+  - wss://nostr.mado.io
+  - wss://nostr.corebreach.com
+  - wss://nostr.hyperlingo.com
+  - wss://nostr.ethtozero.fr
+  - wss://nostr-relay.digitalmob.ro
+  - wss://relay.nvote.co
+  - wss://jiggytom.ddns.net
+  - wss://nostr.sectiontwo.org
+  - wss://nostr.roundrockbitcoiners.com
+  - wss://nostr.nodeofsven.com
+  - wss://nostr.jimc.me
+  - wss://nostr.utxo.lol
+  - wss://relay.lexingtonbitcoin.org
+  - wss://nostr.mikedilger.com
+  - wss://nostr.f44.dev
+  - wss://relay.nyx.ma
+  - wss://nostr.walletofsatoshi.com
+  - wss://nostr.shmueli.org
+  - wss://wizards.wormrobot.org
+  - wss://nostr.orangepill.dev
+  - wss://paid.no.str.cr
+  - wss://nostr.sovbit.com
+  - wss://nostr.datamagik.com
+  - wss://relay.nostrid.com
+  - wss://nostr1.starbackr.me
+  - wss://nostr-relay.schnitzel.world
+  - wss://relay.nostr.express
+  - wss://sg.qemura.xyz
+  - wss://nostr.formigator.eu
+  - wss://nostr.xpersona.net
+  - wss://relay.n057r.club
+  - wss://nostr.digitalreformation.info
+  - wss://nostr.gromeul.eu
+  - wss://nostr-relay.alekberg.net
+  - wss://nostr2.actn.io
+  - wss://nostr-relay.usebitcoin.space
+  - wss://nostrich.friendship.tw
+  - wss://nostr.mustardnodes.com
+  - wss://nostr-alpha.gruntwerk.org
+  - wss://nostr-relay.australiaeast.cloudapp.azure.com
+  - wss://nostr.bch.ninja
+  - wss://nostr-relay.smoove.net
+  - wss://nostr-relay.j3s7m4n.com
+  - wss://nostr.demovement.net
+  - wss://nostr.thesimplekid.com
+  - wss://nostr.aozing.com
+  - wss://nostr.blocs.fr
+  - wss://no.str.watch
+  - wss://nostr.vulpem.com
+  - wss://btc.klendazu.com
+  - wss://nostr.hackerman.pro
+  - wss://relay.realsearch.cc
+  - wss://nostr.mrbits.it
+  - wss://nostr.coollamer.com
+  - wss://node01.nostress.cc
+  - wss://nostr.zenon.wtf
+  - wss://nostr.massmux.com
+  - wss://no.contry.xyz
+  - wss://relay.nostr.bg
+  - wss://nostr.uselessshit.co
+  - wss://brb.io
+  - wss://nostream.gromeul.eu
+  - wss://relay.nostr.ro
+  - wss://nostr.developer.li
+  - wss://nostr.screaminglife.io
+  - wss://deschooling.us
+  - wss://relay-pub.deschooling.us
+  - wss://nostr.bitcoiner.social
+  - wss://nostr-pub1.southflorida.ninja
+  - wss://nostr.ncsa.illinois.edu
+  - wss://nostr.relayer.se
+  - wss://nostr.noones.com
+  - wss://relay.nostr.lu.ke
+  - wss://relay.nostrgraph.net
+  - wss://private-nostr.v0l.io
+  - "wss://relay.nvote.co:443"
+  - wss://relay.nostrprotocol.net
+  - wss://nostr.itssilvestre.com
+  - wss://nostr.whoop.ph
+  - wss://nostr.zoomout.chat
+  - wss://nostr.chaker.net
+  - wss://nostr-1.nbo.angani.co
+  - wss://nostr3.actn.io
+  - wss://nostr.relayer.se
   - wss://relay.nostr.nu
   - wss://relay.taxi
   - wss://relay.nostrprotocol.net
diff --git a/src/components/relays/tasks/RefreshTask.vue b/src/components/relays/tasks/RefreshTask.vue
index ccd4f5e..7063606 100644
--- a/src/components/relays/tasks/RefreshTask.vue
+++ b/src/components/relays/tasks/RefreshTask.vue
@@ -80,7 +80,7 @@ const localMethods = {
       this.sinceLast = this.timeSinceRefresh()
 
       if(this.store.tasks.getProcessed('relays').length >= this.relays.length){
-        this.store.relays.updateNow('relays')
+        this.store.tasks.updateNow('relays')
         this.store.tasks.finishProcessing('relays')
       }
 
@@ -102,6 +102,7 @@ const localMethods = {
   },
 
   invalidate: async function(force, single){
+    console.log('expired', !this.store.tasks.getLastUpdate('relays'), Date.now() - this.store.tasks.getLastUpdate('relays') > this.store.prefs.expireAfter)
     if( (!this.isExpired && !force) ) 
       return
 
@@ -149,7 +150,7 @@ const localMethods = {
   completeAll: function(){
     //console.log('completed')
     this.store.tasks.finishProcessing('relays')
-    this.store.relays.updateNow('relays')
+    this.store.tasks.updateNow('relays')
     this.store.relays.setAggregateCache('public', Object.keys(this.results).filter( result => this.results[result].aggregate === 'public' ))
     this.store.relays.setAggregateCache('restricted', Object.keys(this.results).filter( result => this.results[result].aggregate === 'restricted' ))
     this.store.relays.setAggregateCache('offline', Object.keys(this.results).filter( result => this.results[result].aggregate === 'offline' ))

From 1d9679eb80b736ff9b5b781a26188a13edd4aea3 Mon Sep 17 00:00:00 2001
From: thesimplekid <tsk@thesimplekid.com>
Date: Mon, 9 Jan 2023 10:57:12 -0500
Subject: [PATCH 09/20] Add relays `nostr.thesimplekid.com`

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index 21a9279..eb92612 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -200,3 +200,4 @@ relays:
   - wss://nostr.bostonbtc.com
   - "wss://knostr.neutrine.com:8880"
   - wss://no-str.org
+  - wss://nostr.thesimplekid.com

From 60fe3246ca970ae2662731d1a01ddddebff62242 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:42:44 +0100
Subject: [PATCH 10/20] task queue functional with 1 task type

---
 .gitignore                                    |   1 +
 package.json                                  |   3 +-
 scripts/canonicals.js                         | 213 ++++++++++++++++++
 src/components/relays/nav/RelaysFindNav.vue   |   6 +-
 src/components/relays/nav/RelaysNav.vue       |  13 +-
 src/components/relays/tasks/HistoryTask.vue   |  14 +-
 src/components/relays/tasks/RefreshTask.vue   |  93 ++++----
 .../relays/tasks/RelayCanonicalsTask.vue      |   7 +
 src/components/relays/tasks/TasksManager.vue  |  96 ++++++++
 src/shared/computed.js                        |   2 +-
 src/store/relays.js                           |  29 +--
 src/store/tasks.js                            |  56 +++--
 yarn.lock                                     |  28 +--
 13 files changed, 457 insertions(+), 104 deletions(-)
 create mode 100644 scripts/canonicals.js
 create mode 100644 src/components/relays/tasks/RelayCanonicalsTask.vue
 create mode 100644 src/components/relays/tasks/TasksManager.vue

diff --git a/.gitignore b/.gitignore
index 5b1cffb..b8181c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ public/main.js
 lib/nostr-relay-inspector
 dist
 yarn-error.log
+.env
\ No newline at end of file
diff --git a/package.json b/package.json
index 2d9bf5e..2d9c9be 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "array-timsort": "1.0.3",
     "country-code-emoji": "2.3.0",
     "cross-fetch": "3.1.5",
+    "dotenv": "16.0.3",
     "fast-safe-stringify": "2.1.1",
     "js-yaml": "4.1.0",
     "leaflet": "1.9.3",
@@ -32,7 +33,7 @@
     "node-fetch": "3.3.0",
     "nostr": "0.2.5",
     "nostr-relay-inspector": "0.0.23",
-    "nostr-tools": "1.0.1",
+    "nostr-tools": "1.1.1",
     "object-sizeof": "1.6.3",
     "onion-regex": "2.0.8",
     "path-segments": "0.1.1",
diff --git a/scripts/canonicals.js b/scripts/canonicals.js
new file mode 100644
index 0000000..f9f47aa
--- /dev/null
+++ b/scripts/canonicals.js
@@ -0,0 +1,213 @@
+require('dotenv').config()
+
+const fs = require('fs'),
+      yaml= require('js-yaml'),
+      crypto = require('crypto'),
+      nostrTools = require('nostr-tools'),
+      { RelayPool } = require('nostr'),
+      { validateEvent, verifySignature, signEvent, getEventHash, getPublicKey } = nostrTools,
+    
+      uniques = new Set()
+      
+let   relays = yaml.load(fs.readFileSync('./relays.yaml', 'utf8')).relays,
+      canonicals = new Object(),
+      missing = new Array(),
+      hashes = new Object(),
+      discovered = true,
+      totalSent = 0,
+      oks = 0, 
+      notices = 0
+
+const pool = RelayPool(relays, {reconnect: false})
+
+pool
+  .on('ok', (Relay) => {
+    oks++
+    // console.log('OK', Relay.url)
+  })
+  .on('notice', (Relay, notice) => {
+    notices++
+    // console.log('NOTICE', Relay.url, notice)
+  })
+
+async function run(){
+  // setup()
+  // deletions()
+  // await process.exit()
+  await discover()
+  // process.exit()
+  // console.log(`wtf`, relays.length)
+  // console.log(`hashes`, Object.keys(hashes).length)
+  await sieve()
+
+  setInterval( ()=> {
+    console.log('status', '\ntotal sent:', totalSent, '\noks:', oks, '\nnotices:', notices, '\n\n')
+  }, 60000)
+  await broadcast()
+
+  
+  process.exit()
+    
+}
+
+function setup(){
+  const event = {
+    "id": "a2640e8a6640c595942ccf290eae404ac58569b59af5c8c8e3334d9cf809fff6",
+    "pubkey": "b3b0d247f66bf40c4c9f4ce721abfe1fd3b7529fbc1ea5e64d5f0f8df3a4b6e6",
+    "created_at": 1673275222,
+    "kind": 1,
+    "tags": [],
+    "content": "&lt;3 to all the relays",
+    "sig": "e536be52a04f95c54e5cc82caafb9b25c8d47e00182c0eac0b6b678b482710288cc7fd85c62b0f97f5ed33dfbd7e15555c9bfeac059794767e414666d807f9cf"
+  }
+
+  pool.send(['EVENT', event])
+}
+
+async function discover(){
+  
+
+  console.log('relays', relays.length)
+
+  return new Promise(resolve => {
+    const subid = crypto.randomBytes(40).toString('hex')
+    
+    pool
+      .on('open', Relay => {
+        console.log('open', Relay.url)
+        Relay.subscribe(subid, {limit: relays.length, kinds:[1], "#t": ['canonical'], authors:[ getPublicKey(process.env.PRIVATE_KEY) ] }, )
+        relays.forEach( relay => {
+          hashes[hash(relay)] = relay
+          // Relay.subscribe(`subid_${relay}`, {limit: 1, kinds:[1], authors:[ getPublicKey(process.env.PRIVATE_KEY) ] }, )
+        })
+        
+      })
+      .on('event', (Relay, _subid, event) => {
+        if(!discovered){
+          // console.log('published event found', event.id)
+        }
+        if(_subid.includes(subid) && discovered) {   
+          // console.log('event', event.content, event.id)     
+
+          if(uniques.has(event.id))
+            return 
+
+          const relayHash = event.tags.map( tag => tag[0]=='h' ? tag[1] : false )[0]
+
+          if(!relayHash)
+            return
+
+          // console.log('relay hash', Relay.url, relayHash)
+
+          const relay = hashes?.[relayHash]
+
+          uniques.add(event.id)
+          canonicals[relay] = event
+        }
+      })
+
+    setTimeout( () => {
+      // pool.close()
+      discovered = false 
+      resolve(relays) 
+    }, 10*1000 )
+  })
+}
+
+async function sieve(){
+  console.log('filtering relays', relays.length)
+  checkMissing()
+  console.log('missing', missing.length)
+  return
+}
+
+function checkMissing(){
+  missing = new Array()
+  relays.forEach( relay => {
+    // console.log('check missing', relay, (canonicals?.[relay] instanceof Object) )
+    if( !(canonicals?.[relay] instanceof Object) )
+      missing.push(relay)
+  })
+}
+
+async function broadcast(){
+  for(let i=0;i<missing.length;i++){
+    const relay = missing[i]
+    const event = {
+      created_at: Math.floor(Date.now()/1000),
+      content: `<3 ${relay}, canonical note for https://nostr.watch/relay/${relay.replace('wss://', '')}`,
+      kind: 1,
+      tags: [
+        ['h', hash(relay)],
+        ['t', 'canonical'],
+        ['e', process.env.CANONICAL_NOTE, 'wss://nostr.sandwich.farm']
+      ] 
+    }
+    const signedEvent = await sign(event, relay)
+
+    if(!signedEvent)
+      return 
+
+    // console.log("sending to pool", signedEvent)
+    pool.send(['EVENT', signedEvent])
+    totalSent++
+    console.log('total sent, backlog', totalSent)
+    await delay(60*1000)
+  }
+  console.log('finished.')
+}
+
+async function sign(event, relay){
+  // console.log('event to sign', event)
+  event.pubkey = getPublicKey(process.env.PRIVATE_KEY)
+  event.id = getEventHash(event)
+  event.sig = await signEvent(event, process.env.PRIVATE_KEY)
+
+  let ok = validateEvent(event)
+  let veryOk = await verifySignature(event)
+
+  // if(relay)
+  //   console.log('sign valid', relay, ':', ok, veryOk)
+  // else 
+  //   console.log('sign valid', ':', ok, veryOk)
+  
+  if( ok && veryOk )
+    return event
+  else 
+    console.error('event is invalid', event)
+}
+
+async function deletions(){
+  const tags = [
+    ["e", "8e68215676f0bfcc386e3cc0d9e975e7fab1aed91d781c4ec3aac5f4c2c11e24"],
+    ["e", "00834b0779cd0a87b6eeb5d25e22e887b007a30239a1e75cb567324a687e000b"],
+    ["e", "783f57bfbeb3c4e1cd13cc493b021cb0c353ab98c1d02f5378dfdfb0afcc77fd"]
+  ]
+
+  const event = {
+    "kind": 5,
+    created_at: Math.floor(Date.now()/1000),
+    "tags": tags,
+    "content": "delete dev posts"
+  }
+  const signedEvent = await sign(event)
+
+  if(!signedEvent)
+    return 
+
+  console.log("sending to pool", signedEvent)
+
+  pool.send(['EVENT', signedEvent])
+
+  return 
+}
+
+async function delay(ms) {
+  return new Promise( resolve => setTimeout(resolve, ms) )
+}
+
+function hash(relay){
+  return crypto.createHash('md5').update(relay).digest('hex');
+}
+
+run()
\ No newline at end of file
diff --git a/src/components/relays/nav/RelaysFindNav.vue b/src/components/relays/nav/RelaysFindNav.vue
index 98eb0af..55cdded 100644
--- a/src/components/relays/nav/RelaysFindNav.vue
+++ b/src/components/relays/nav/RelaysFindNav.vue
@@ -15,7 +15,7 @@
         </div>
       </div>
       <div class="flex flex-1 items-center justify-center px-2 lg:ml-6 lg:justify-end">
-        <RelaysSearchFilter />
+        <!-- <RelaysSearchFilter /> -->
       </div>
       <div class="flex items-center lg:hidden">
         <!-- Mobile menu button -->
@@ -52,7 +52,7 @@ import { defineComponent } from 'vue'
 //pinia
 import { setupStore } from '@/store'
 //components 
-import RelaysSearchFilter from '@/components/relays/blocks/RelaysSearchFilter.vue'
+// import RelaysSearchFilter from '@/components/relays/blocks/RelaysSearchFilter.vue'
 //nav conf
 import { items } from './config/relays.find.yaml'
 //shared methods 
@@ -67,7 +67,7 @@ export default defineComponent({
 title: "nostr.watch registry & network status",
 name: 'RelaysFindNav',
 components: {
-  RelaysSearchFilter,
+  // RelaysSearchFilter,
   Disclosure, DisclosureButton, DisclosurePanel,
   Bars3Icon, XMarkIcon,
   // PreferencesComponent,
diff --git a/src/components/relays/nav/RelaysNav.vue b/src/components/relays/nav/RelaysNav.vue
index 524dc19..e3229d2 100644
--- a/src/components/relays/nav/RelaysNav.vue
+++ b/src/components/relays/nav/RelaysNav.vue
@@ -18,10 +18,9 @@
         </div>
       </div>
       <div class="width-max lg:flex lg:ml-auto">
-          <RefreshTask
-            v-bind:resultsProp="results"
-            v-if="path == '/relays/find' || path.includes(`/relay/`)"/>
-        </div>
+        <TasksManager
+          :resultsProp="results" />
+      </div>
       </div>
   </div>
 </template>
@@ -35,8 +34,8 @@ import RelaysLib from '@/shared/relays-lib.js'
 import { setupNavData, mountNav, setActiveContent, loadNavContent, routeValid, parseHash, contentIsActive } from '@/shared/hash-router.js'
 // import RefreshTask from '@/components/relays/tasks/RefreshTask.vue'
 
-const RefreshTask = defineAsyncComponent(() =>
-    import("@/components/relays/tasks/RefreshTask.vue" /* webpackChunkName: "RefreshTask" */)
+const TasksManager = defineAsyncComponent(() =>
+    import("@/components/relays/tasks/TasksManager.vue" /* webpackChunkName: "TasksManager" */)
 );
 
 
@@ -44,7 +43,7 @@ export default defineComponent({
   title: "nostr.watch registry & network status",
   name: 'RelaysNav',
   components: {
-    RefreshTask,
+    TasksManager,
   },
   props: {
     resultsProp: {
diff --git a/src/components/relays/tasks/HistoryTask.vue b/src/components/relays/tasks/HistoryTask.vue
index 68c55ec..11cc686 100644
--- a/src/components/relays/tasks/HistoryTask.vue
+++ b/src/components/relays/tasks/HistoryTask.vue
@@ -265,18 +265,18 @@ export default defineComponent({
 
   methods: Object.assign(RelaysLib, {
     invalidate: async function(){
-      if( !this.store.tasks.isAnyProcessing && this.isExpired() ) {
-        this.store.tasks.startProcessing('history')
+      if( !this.store.tasks.isAnyProcessing && this.isExpired('relays/history') ) {
+        this.store.tasks.startProcessing('relays/history')
         this.store.stats.set( 'nips', this.collateSupportedNips )
-        this.store.tasks.addProcessed('history', 'nips')
+        this.store.tasks.addProcessed('relays/history', 'nips')
         this.store.stats.set( 'continents', this.collateContinents )
-        this.store.tasks.addProcessed('history', 'continents')
+        this.store.tasks.addProcessed('relays/history', 'continents')
         this.store.stats.set( 'countries', this.collateCountries )
-        this.store.tasks.addProcessed( 'history', 'countries' )
+        this.store.tasks.addProcessed( 'relays/history', 'countries' )
         this.remoteTask = await this.historicalData()
-        this.store.tasks.addProcessed( 'history', 'firstSeen' )
+        this.store.tasks.addProcessed( 'relays/history', 'firstSeen' )
         // this.store.stats.setHistory(remoteTask)
-        this.store.tasks.finishProcessing( 'history' )
+        this.store.tasks.finishProcessing( 'relays/history' )
       }
     },
     collateSoftware(){ 
diff --git a/src/components/relays/tasks/RefreshTask.vue b/src/components/relays/tasks/RefreshTask.vue
index 7063606..4990982 100644
--- a/src/components/relays/tasks/RefreshTask.vue
+++ b/src/components/relays/tasks/RefreshTask.vue
@@ -63,10 +63,11 @@ const localMethods = {
     }
   },
 
-  addToQueue: function(id, fn){
+  addToQueue: function(id, fn, unique){
     this.store.tasks.addJob({
       id: id,
-      handler: fn.bind(this)
+      handler: fn,
+      unique: unique
     })
   },
 
@@ -102,54 +103,60 @@ const localMethods = {
   },
 
   invalidate: async function(force, single){
-    console.log('expired', !this.store.tasks.getLastUpdate('relays'), Date.now() - this.store.tasks.getLastUpdate('relays') > this.store.prefs.expireAfter)
-    if( (!this.isExpired && !force) ) 
+    // console.log('expired', !this.store.tasks.getLastUpdate('relays'), Date.now() - this.store.tasks.getLastUpdate('relays') > this.store.prefs.expireAfter)
+    if( (!this.isExpired('relays') && !force) ) 
       return
 
-    console.log('windowActive', this.windowActive)
+    // console.log('windowActive', this.windowActive)
     if(!this.windowActive)
       return
 
-    this.store.tasks.startProcessing('relays')
+    this.addToQueue('relays', async () => {
+      const relays = this.relays.filter( relay => !this.store.tasks.isProcessed('relays', relay) )
+
+      console.log('unprocessed relays', 
+        this.relays.filter( relay => !this.store.tasks.getProcessed('relays').includes(relay)))
+
+      if(single) {
+        await this.check(single)
+      } 
+      else {
+        for(let index = 0; index < relays.length; index++) {
+          await this.delay(this.averageLatency)
+          const relay = relays[index]
+          this.check(relay)
+            .then((result) => this.completeRelay(relay, result) )
+            // .then( async () => {
+            //   // this.history = await History()
+            // })
+            .catch( () => this.completeRelay(relay) )
+        }
+      } 
+    }, true)
+
+    console.log('queue', this.store.tasks.getActive)
     
-    const relays = this.relays.filter( relay => !this.store.tasks.isProcessed('relays', relay) )
-
-    console.log('unprocessed relays', 
-      this.relays.filter( relay => !this.store.tasks.getProcessed('relays').includes(relay)))
-
-    if(single) {
-      await this.check(single)
-    } 
-    else {
-      for(let index = 0; index < relays.length; index++) {
-        await this.delay(this.averageLatency)
-        const relay = relays[index]
-        this.check(relay)
-          .then((result) => {
-            if(this.store.tasks.isProcessed('relays', relay))
-              return 
-            
-            this.store.tasks.addProcessed('relays', result.url)
-
-            this.results[result.url] = result
-            this.setCache(result)
-
-            if(this.store.tasks.getProcessed('relays').length >= this.relays.length)
-              this.completeAll()
-
-            return this.results
-          })
-          .then( async () => {
-            // this.history = await History()
-          })
-          .catch( err => console.error(err) )
-      }
-    } 
+  },
+
+  completeRelay: function(relay, result){
+    if(this.store.tasks.isProcessed('relays', relay))
+      return 
+
+    this.store.tasks.addProcessed('relays', relay)
+    
+    if(result)  {
+      this.results[relay] = result
+      this.setCache(result)
+    }
+      
+    if(this.store.tasks.getProcessed('relays').length >= this.relays.length)
+      this.completeAll()
   },
 
   completeAll: function(){
     //console.log('completed')
-    this.store.tasks.finishProcessing('relays')
+    this.store.tasks.completeJob()
+    // this.store.tasks.finishProcessing('relays')
     this.store.tasks.updateNow('relays')
     this.store.relays.setAggregateCache('public', Object.keys(this.results).filter( result => this.results[result].aggregate === 'public' ))
     this.store.relays.setAggregateCache('restricted', Object.keys(this.results).filter( result => this.results[result].aggregate === 'restricted' ))
@@ -164,7 +171,7 @@ const localMethods = {
           checkLatency: true,          
           getInfo: true,
           getIdentities: true,
-          // debug: true,
+          debug: true,
           connectTimeout: this.getDynamicTimeout,
           readTimeout: this.getDynamicTimeout,
           writeTimeout: this.getDynamicTimeout,
@@ -184,6 +191,7 @@ const localMethods = {
         })
         .on('close', () => {
           //console.log(`${relay.url} has closed`)
+          reject()
         })
         .on('error', () => {
           reject()
@@ -265,6 +273,9 @@ export default defineComponent({
   },
   mounted(){
     this.migrateLegacy()
+
+    console.log('is processing', this.store.tasks.isProcessing(`relays`))
+
     if(this.store.tasks.isProcessing(`relays`))
       this.invalidate(true)
     else
diff --git a/src/components/relays/tasks/RelayCanonicalsTask.vue b/src/components/relays/tasks/RelayCanonicalsTask.vue
new file mode 100644
index 0000000..2383635
--- /dev/null
+++ b/src/components/relays/tasks/RelayCanonicalsTask.vue
@@ -0,0 +1,7 @@
+<template>
+  
+</template>
+
+<script>
+
+</script>
\ No newline at end of file
diff --git a/src/components/relays/tasks/TasksManager.vue b/src/components/relays/tasks/TasksManager.vue
new file mode 100644
index 0000000..a57dbc9
--- /dev/null
+++ b/src/components/relays/tasks/TasksManager.vue
@@ -0,0 +1,96 @@
+<template>
+  <RefreshTask
+    v-if="showRefreshRelays"
+    v-bind:resultsProp="results" />
+  <RelayCanonicalsTask
+    v-else-if="showGetRelayCanonicals"
+    v-bind:resultsProp="results" />
+</template>
+
+<script>
+import { defineComponent, toRefs } from 'vue'
+import { useRoute } from 'vue-router'
+
+import { setupStore } from '@/store'
+
+import SharedComputed from '@/shared/computed.js'
+
+import RefreshTask from './RefreshTask.vue'
+
+export default defineComponent({
+  name: "TasksManager",
+  components: {
+    RefreshTask
+  },
+  setup(props){
+    const {resultsProp: results} = toRefs(props)
+    return { 
+      store : setupStore(),
+      results: results
+    }
+  },
+  beforeMount(){
+    //https://github.com/iendeavor/pinia-plugin-persistedstate-2/issues/136
+    this.store.tasks.active = new Array()
+    this.store.tasks.pending = new Array()
+    this.store.tasks.completed = new Array()
+  },
+  mounted(){
+    this.store.tasks.$subscribe( (mutation) => {
+      console.log('mutation', mutation.events)
+      if(mutation.events.key === 'currentTask')
+        this.processJob()
+    })
+    this.processJob()
+  },
+  props: {
+    resultsProp: {
+      type: String,
+      default: "Tooltip text",
+    },
+  },
+  methods: {
+    processJob(){
+      console.log('trying processJob()')
+      if(!this.store.tasks.active?.handler)
+        return 
+      console.log('processJob()', this.store.tasks.active.id)
+      this.store.tasks.active.handler()
+    }
+  },
+  computed: Object.assign(SharedComputed, {
+    path: function() { return useRoute().path },
+    showRefreshRelays: function(){
+      return ( 
+                this.path.includes('/relays/find')
+                || this.path.includes(`/relay/`)
+              ) 
+              && 
+              (
+                ( 
+                  this.store.tasks.isProcessing('relays') 
+                  && this.store.tasks.currentTask == 'relays'
+                )
+                || 
+                (
+                  !this.store.tasks.isAnyProcessing
+                )
+              )
+    },
+    showGetRelayCanonicals: function(){
+      return (
+              ( 
+                this.store.tasks.isProcessing('relays/canonicals') 
+                && this.store.tasks.currentTask == 'relays/canonicals'
+              )
+              || 
+              (
+                !this.store.tasks.isAnyProcessing
+              )
+            )
+            &&
+            this.isExpired('relays/canonicals')
+    }
+  })
+});
+</script>
\ No newline at end of file
diff --git a/src/shared/computed.js b/src/shared/computed.js
index cca2f96..5f37b00 100644
--- a/src/shared/computed.js
+++ b/src/shared/computed.js
@@ -1,5 +1,5 @@
 export default {
     isExpired: function(){
-        return !this.store.tasks.getLastUpdate('relays') || Date.now() - this.store.tasks.getLastUpdate('relays') > this.store.prefs.expireAfter
+        return (slug) => !this.store.tasks.getLastUpdate(slug) || Date.now() - this.store.tasks.getLastUpdate(slug) > this.store.prefs.expireAfter
     },
 }
\ No newline at end of file
diff --git a/src/store/relays.js b/src/store/relays.js
index d7c4c39..a0a2608 100644
--- a/src/store/relays.js
+++ b/src/store/relays.js
@@ -7,14 +7,15 @@ export const useRelaysStore = defineStore('relays', {
     urls: new Array(),
     // results: new Object(),
     geo: new Object(),
-    lastUpdate: {},
+    lastUpdate: null,
     count: new Object(),
     processing: false,
     processedRelays: new Set(),
     favorites: new Array(),
     aggregates: {},
     aggregatesAreSet: false,
-    cached: new Object()
+    cached: new Object(),
+    canonicals: new Object()
   }),
   getters: {
     getAll: (state) => state.urls,
@@ -25,7 +26,7 @@ export const useRelaysStore = defineStore('relays', {
         return state.favorites
       return state.urls.filter( (relay) => results?.[relay]?.aggregate == aggregate)
     },
-    getByAggregate: (state) => (aggregate) => {
+    getByAggregate: state => aggregate => {
       return state.urls
               .filter( (relay) => state.results?.[relay]?.aggregate == aggregate)
     },
@@ -33,20 +34,22 @@ export const useRelaysStore = defineStore('relays', {
     // getResults: (state) => state.results,
     // getResult: (state) => (relayUrl) => state.results?.[relayUrl],
     
-    getGeo: (state) => (relayUrl) => state.geo[relayUrl],
+    getGeo: state => relayUrl => state.geo[relayUrl],
 
-    getLastUpdate: (state) => state.lastUpdate,
+    getLastUpdate: state => state.lastUpdate,
 
-    getCount: (state) => (type) => state.count[type],
-    getCounts: (state) => state.count,
+    getCount: state => type => state.count[type],
+    getCounts: state => state.count,
 
-    getAggregate: (state) => (which) => state.aggregates[which],
-    areAggregatesSet: (state) => state.aggregatesAreSet,
+    getAggregate: state => which => state.aggregates[which],
+    areAggregatesSet: state => state.aggregatesAreSet,
 
-    getFavorites: (state) => state.favorites,
-    isFavorite: (state) => (relayUrl) => state.favorites.includes(relayUrl),
+    getFavorites: state => state.favorites,
+    isFavorite: state => relayUrl => state.favorites.includes(relayUrl),
 
-    getAggregateCache: (state) => (aggregate) => state.cached[aggregate] instanceof Array ? state.cached[aggregate] : [],
+    getAggregateCache: state => aggregate => state.cached[aggregate] instanceof Array ? state.cached[aggregate] : [],
+
+    getCanonical: state => relay => state.canonicals[relay]
   },
   actions: {
     addRelay(relayUrl){ this.urls.push(relayUrl) },
@@ -62,7 +65,7 @@ export const useRelaysStore = defineStore('relays', {
 
     setGeo(geo){ this.geo = geo },
 
-    updateNow(key){ this.lastUpdate[key] = Date.now() },
+
 
     setStat(type, value){ 
       this.count[type] = value 
diff --git a/src/store/tasks.js b/src/store/tasks.js
index 1921fb7..5cd288a 100644
--- a/src/store/tasks.js
+++ b/src/store/tasks.js
@@ -4,15 +4,15 @@ export const useTaskStore = defineStore('tasks', {
   state: () => ({ 
     lastUpdate: new Object(),
 
+    //processing cache
+    processing: new Object(),
+    processed: new Object(),
+    currentTask: new String(),
+
     //queue
     pending: new Array(),
     completed: new Array(),
     active: new Object(),
-
-    //legacy
-    processing: new Object(),
-    processed: new Object(),
-    currentTask: new Object(),
   }),
   getters: {
     getLastUpdate: (state) => (key) => state.lastUpdate[key],
@@ -25,39 +25,54 @@ export const useTaskStore = defineStore('tasks', {
     },
     isProcessing: (state) => (key) => state.processing[key],
     isProcessed: (state) => (key, relay) => state.getProcessed(key).includes(relay),
-    isAnyProcessing: (state) => Object.keys(state.processing).filter( key => state.processing[key] ),
+    isAnyProcessing: (state) => Object.keys(state.processing).filter( key => state.processing[key] ).length ? true : false,
 
     //queue/lists
     getPending: (state) => state.pending,
     getActive: (state) => state.active,
     getActiveSlug: (state) => state.active.id,
     getCompleted: (state) => state.completed,
+
     //queue/states
     isActive: (state) => Object.keys( state.active ).length > 0,
     isIdle: (state) => Object.keys( state.active ).length == 0,
     arePending: (state) => state.pending.length > 0,
-    //
-    // getRate: (state) => (key) => state.rate[key],
+
   },
   actions: {
     updateNow(key){ this.lastUpdate[key] = Date.now() },
     //queue
     addJob(job){
+      if(job?.unique){
+        let exists
+        exists = this.active.id === job.id
+        if(!exists)
+          exists = this.pending.filter( j => j.id === job.id).length ? true : false
+        if(exists)
+          return
+      }
       this.pending.push(job)
       if( this.isIdle )
         this.startNextJob()
     },
     startNextJob(){
-      if( this.isActive ) 
-        this.completed.push(this.active)
+      console.log('task, isactive?', this.isActive)
       if( this.arePending ) {
         this.active = this.pending[0]
         this.pending.shift()
+        this.startProcessing(this.active)
       }
       else {
+        console.log('completing active...')
         this.active = {}
       }
     },
+    completeJob(){
+      console.log('compelteJob', this.active.id, this.active)
+      this.finishProcessing(this.active.id)
+      this.completed.push(this.active)
+      this.startNextJob()
+    },
     clearJobs(type){
       this[type] = new Array()
     },
@@ -69,14 +84,15 @@ export const useTaskStore = defineStore('tasks', {
       this.pending.splice( index, 1 )
     },
     //legacy
-    startProcessing(key) { 
-      this.processing[key] = true 
-      this.currentTask[key] = key
+    startProcessing(job) { 
+      this.addJob(job)
+      this.processing[job.id] = true 
+      this.currentTask = job.id
     },
     finishProcessing(key) { 
       this.processed[key] = new Array()
       this.processing[key] = false 
-      this.currentTask[key] = null
+      this.currentTask = null
     },
     addProcessed(key, relay){
       if( !(this.processed[key] instanceof Array) )
@@ -86,4 +102,16 @@ export const useTaskStore = defineStore('tasks', {
     },
     
   },
+  share: {
+    // An array of fields that the plugin will ignore.
+    omit: ['pending', 'completed', 'active'],
+    // Override global config for this store.
+    enable: true,
+  },
+},
+{
+  persistedState: {
+    // includePaths: ['lastUpdate', 'processed', 'processing', 'currentTask']
+    excludePaths: ['pending', 'completed', 'active'],
+  }
 })
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 488101a..a4d4ba2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1302,7 +1302,7 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
   integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
 
-"@scure/base@~1.1.0":
+"@scure/base@^1.1.1", "@scure/base@~1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938"
   integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==
@@ -2503,11 +2503,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-arraybuffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
-  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
-
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -2525,11 +2520,6 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
-bech32@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bech32/-/bech32-2.0.0.tgz#078d3686535075c8c79709f054b1b226a133b355"
-  integrity sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3732,6 +3722,11 @@ dotenv-expand@^5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
+dotenv@16.0.3:
+  version "16.0.3"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
+  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
+
 dotenv@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
@@ -6410,17 +6405,16 @@ nostr-relay-inspector@0.0.23:
     tape "5.6.1"
     yaml-loader "0.8.0"
 
-nostr-tools@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nostr-tools/-/nostr-tools-1.0.1.tgz#acf21758fc745674ed047e7dc219b30baf489005"
-  integrity sha512-URBNadrVq4qSmndzd4clZqubze4y/LB8cdzzen9mNwlFh3ICDdWp7TCShTbLEZQYPPSVoOe2n13l77jzcVvH/w==
+nostr-tools@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/nostr-tools/-/nostr-tools-1.1.1.tgz#2be4cd650bc0a4d20650b6cf46fee451c9f565b8"
+  integrity sha512-mxgjbHR6nx2ACBNa2tBpeM/glsPWqxHPT1Kszx/XfzL+kUdi1Gm3Xz1UcaODQ2F84IFtCKNLO+aF31ZfTAhSYQ==
   dependencies:
     "@noble/hashes" "^0.5.7"
     "@noble/secp256k1" "^1.7.0"
+    "@scure/base" "^1.1.1"
     "@scure/bip32" "^1.1.1"
     "@scure/bip39" "^1.1.0"
-    base64-arraybuffer "^1.0.2"
-    bech32 "^2.0.0"
 
 nostr@0.2.5:
   version "0.2.5"

From 3ba985bed18fd376e2936ed5a2c9c51f7aaff2b8 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 22:25:49 +0100
Subject: [PATCH 11/20] test queue, add some tasks but make them inactive for
 now.

---
 scripts/canonicals.js                         |  12 +-
 src/components/TaskManager.vue                |   0
 .../relays/blocks/RelaysResultTable.vue       |  65 +++++--
 src/components/relays/tasks/RefreshTask.vue   |  92 +++++-----
 .../relays/tasks/RelayCanonicalsTask.vue      | 153 +++++++++++++++-
 .../relays/tasks/RelayOperatorTask.vue        | 164 ++++++++++++++++++
 src/components/relays/tasks/TasksManager.vue  |  45 +----
 src/components/relays/tasks/TemplateTask.vue  | 106 +++++++++++
 src/components/user/AuthComponent.vue         |  28 +--
 src/store/profiles.js                         |   2 +-
 src/store/relays.js                           |   7 +-
 src/store/tasks.js                            |   2 +-
 12 files changed, 558 insertions(+), 118 deletions(-)
 delete mode 100644 src/components/TaskManager.vue
 create mode 100644 src/components/relays/tasks/RelayOperatorTask.vue
 create mode 100644 src/components/relays/tasks/TemplateTask.vue

diff --git a/scripts/canonicals.js b/scripts/canonicals.js
index f9f47aa..37da63d 100644
--- a/scripts/canonicals.js
+++ b/scripts/canonicals.js
@@ -39,13 +39,7 @@ async function run(){
   // console.log(`wtf`, relays.length)
   // console.log(`hashes`, Object.keys(hashes).length)
   await sieve()
-
-  setInterval( ()=> {
-    console.log('status', '\ntotal sent:', totalSent, '\noks:', oks, '\nnotices:', notices, '\n\n')
-  }, 60000)
   await broadcast()
-
-  
   process.exit()
     
 }
@@ -131,6 +125,10 @@ function checkMissing(){
 }
 
 async function broadcast(){
+  setInterval( ()=> {
+    console.log('status', '\ntotal sent:', totalSent, '\noks:', oks, '\nnotices:', notices, '\n\n')
+  }, 60000)
+  
   for(let i=0;i<missing.length;i++){
     const relay = missing[i]
     const event = {
@@ -152,7 +150,7 @@ async function broadcast(){
     pool.send(['EVENT', signedEvent])
     totalSent++
     console.log('total sent, backlog', totalSent)
-    await delay(60*1000)
+    await delay(10*1000)
   }
   console.log('finished.')
 }
diff --git a/src/components/TaskManager.vue b/src/components/TaskManager.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/relays/blocks/RelaysResultTable.vue b/src/components/relays/blocks/RelaysResultTable.vue
index 90d5fe7..49f2a3c 100644
--- a/src/components/relays/blocks/RelaysResultTable.vue
+++ b/src/components/relays/blocks/RelaysResultTable.vue
@@ -27,6 +27,12 @@
                           </label>
                         </span>
                       </th>
+                      <th scope="col" class="relative py-3.5 pl-0 pr-0 sm:pr-0">
+                        <code class="text-xs block">Favorite</code>
+                      </th>
+                      <!-- <th scope="col" class="relative py-3.5 pl-0 pr-0 sm:pr-0" v-if="isLoggedIn()">
+                        <code class="text-xs block">Upvote</code>
+                      </th> -->
                       <th scope="col" class="hidden md:table-cell lg:table-cell xl:table-cell verified">
                         <!-- <span class="verified-shape-wrapper">
                           <span class="shape verified"></span>
@@ -53,9 +59,6 @@
                         <code class="text-xs block">Write</code>
                         <!-- ✏️ -->
                       </th>
-                      <th scope="col" class="relative py-3.5 pl-0 pr-0 sm:pr-0">
-                        <code class="text-xs block">Favorite</code>
-                      </th>
                     </tr>
                 </thead>
                 <tbody class="divide-y divide-gray-200 bg-white">
@@ -74,6 +77,23 @@
                         <a :href="`/relay/${relayClean(relay)}`">{{ relay.replace('wss://', '') }}</a>
                       </td>
 
+                      <td class="w-16 fav text-center">
+                        <a
+                          class="hover:opacity-100 cursor-pointer" 
+                          :class="store.relays.isFavorite(relay) ? 'opacity-100' : 'opacity-10'"
+                          @click="store.relays.toggleFavorite(relay)">
+                          ❤️
+                        </a>
+                      </td>
+
+                      <!-- <td class="w-16 fav text-center" v-if="isLoggedIn()">
+                        <a
+                          class=" hover:opacity-100 cursor-pointer opacity-20" 
+                          @click="likeRelay(relay)">
+                          👍
+                        </a>
+                      </td> -->
+
                       <td class="w-12 verified text-center md:table-cell lg:table-cell xl:table-cell">
                         <span v-if="this.results[relay]?.identities">
                           <span v-tooltip:top.tooltip="identityList(relay)"> <span class="verified-shape-wrapper cursor-pointer" v-if="Object.entries(results[relay]?.identities).length"><span class="shape verified"></span></span></span>
@@ -107,14 +127,7 @@
                         <span class="m-auto block" :class="getCheckIndicator(relay, 'write')">&nbsp;</span>
                       </td>
 
-                      <td class="w-16 fav text-center" :key="generateKey(relay, 'check.write')">
-                        <a
-                          class=" hover:opacity-100 cursor-pointer" 
-                          :class="store.relays.isFavorite(relay) ? 'opacity-100' : 'opacity-10'"
-                          @click="store.relays.toggleFavorite(relay)">
-                          ❤️
-                        </a>
-                      </td>
+                      
                     </tr>
                 </tbody>
                 </table>
@@ -138,10 +151,36 @@
   import NostrSyncPopoverNag from '@/components/relays/partials/NostrSyncPopoverNag.vue'
   
   import RelaysLib from '@/shared/relays-lib.js'
+  import UserLib from '@/shared/user-lib.js'
+
+  import {validateEvent, getEventHash, verifySignature} from 'nostr-tools'
   
   import { setupStore } from '@/store'
   
-  const localMethods = {}
+  const localMethods = {
+    async likeRelay(relay){
+      const id = this.store.relays.getCanonical(relay)
+      const event = {
+        created_at: Math.floor(Date.now()/1000),
+        kind: 7,
+        content: '+',
+        tags: [
+          ['e', id],
+          ['p', this.store.user.getPublicKey]
+        ],
+        pubkey: this.store.user.getPublicKey
+      }
+      event.id = getEventHash(event)
+
+      console.log('like event', event)
+      const signedEvent = await window.nostr.signEvent(event)
+
+      let ok = validateEvent(signedEvent)
+      let veryOk = await verifySignature(signedEvent)
+
+      console.log('valid event?', ok, veryOk)
+    },
+  }
   
   export default defineComponent({
     name: 'ListClearnet',
@@ -310,7 +349,7 @@
         return (relay) => relay.replace('wss://', '')
       },
     },
-    methods: Object.assign(RelaysLib, localMethods),
+    methods: Object.assign(RelaysLib, UserLib, localMethods),
   })
   </script>
 
diff --git a/src/components/relays/tasks/RefreshTask.vue b/src/components/relays/tasks/RefreshTask.vue
index 4990982..2ae4460 100644
--- a/src/components/relays/tasks/RefreshTask.vue
+++ b/src/components/relays/tasks/RefreshTask.vue
@@ -1,23 +1,26 @@
 <template>
   
-  <span class="text-white lg:text-sm mr-2 ml-2 mt-1.5 text-xs">
-    <span v-if="!store.tasks.isProcessing(`relays`)">Checked {{ sinceLast }} ago</span>
-    <span v-if="store.tasks.isProcessing(`relays`)" class="italic lg:pr-9">
+  <span 
+    v-if="!store.tasks.isActive || store.tasks.getActiveSlug === this.taskSlug"
+    class="text-white lg:text-sm mr-2 ml-2 mt-1.5 text-xs">
+
+    <span v-if="!store.tasks.isProcessing(this.taskSlug)">Checked {{ sinceLast }} ago</span>
+    <span v-if="store.tasks.isProcessing(this.taskSlug)" class="italic lg:pr-9">
       <svg class="animate-spin mr-1 -mt-0.5 h-4 w-5 text-white inline" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
         <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
         <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
       </svg>
-      {{ this.store.tasks.getProcessed('relays').length }}/{{ this.relays.length }} Relays Checked
+      {{ this.store.tasks.getProcessed(this.taskSlug).length }}/{{ this.relays.length }} Relays Checked
     </span>
   </span>
-  <span class="text-white text-sm mr-2 mt-1.5" v-if="!store.tasks.isProcessing(`relays`)">-</span>
-  <span class="text-white text-sm mr-2 mt-1.5" v-if="store.prefs.refresh && !store.tasks.isProcessing(`relays`)"> 
+  <span class="text-white text-sm mr-2 mt-1.5" v-if="!store.tasks.isProcessing(this.taskSlug)">-</span>
+  <span class="text-white text-sm mr-2 mt-1.5" v-if="store.prefs.refresh && !store.tasks.isProcessing(this.taskSlug)"> 
     Next check in: {{ untilNext  }}
   </span>
   <button 
-    v-if="!store.tasks.isProcessing(`relays`)"
+    v-if="!store.tasks.isProcessing(this.taskSlug)"
     class="mr-8 my-1 py-0 px-3 text-xs rounded border-b-3 border-slate-700 bg-slate-500  font-bold text-white hover:border-slate-500 hover:bg-slate-400" 
-    :disabled='store.tasks.isProcessing(`relays`)' 
+    :disabled='store.tasks.isProcessing(this.taskSlug)' 
     @click="refreshNow()">
       Check{{ relay ? ` ${relay}` : "" }} Now
   </button>
@@ -63,7 +66,7 @@ const localMethods = {
     }
   },
 
-  addToQueue: function(id, fn, unique){
+  queueJob: function(id, fn, unique){
     this.store.tasks.addJob({
       id: id,
       handler: fn,
@@ -80,12 +83,12 @@ const localMethods = {
       this.untilNext = this.timeUntilRefresh()
       this.sinceLast = this.timeSinceRefresh()
 
-      if(this.store.tasks.getProcessed('relays').length >= this.relays.length){
-        this.store.tasks.updateNow('relays')
-        this.store.tasks.finishProcessing('relays')
+      if(this.store.tasks.getProcessed(this.taskSlug).length >= this.relays.length){
+        this.store.tasks.updateNow(this.taskSlug)
+        this.store.tasks.finishProcessing(this.taskSlug)
       }
 
-      if(!this.store.tasks.isProcessing('relays'))
+      if(!this.store.tasks.isProcessing(this.taskSlug))
         this.invalidate()
     }, 1000)
   },
@@ -103,19 +106,19 @@ const localMethods = {
   },
 
   invalidate: async function(force, single){
-    // console.log('expired', !this.store.tasks.getLastUpdate('relays'), Date.now() - this.store.tasks.getLastUpdate('relays') > this.store.prefs.expireAfter)
-    if( (!this.isExpired('relays') && !force) ) 
+    // console.log('expired', !this.store.tasks.getLastUpdate(this.taskSlug), Date.now() - this.store.tasks.getLastUpdate(this.taskSlug) > this.store.prefs.expireAfter)
+    if( (!this.isExpired(this.taskSlug) && !force) ) 
       return
 
     // console.log('windowActive', this.windowActive)
     if(!this.windowActive)
       return
 
-    this.addToQueue('relays', async () => {
-      const relays = this.relays.filter( relay => !this.store.tasks.isProcessed('relays', relay) )
+    this.queueJob(this.taskSlug, async () => {
+      const relays = this.relays.filter( relay => !this.store.tasks.isProcessed(this.taskSlug, relay) )
 
       console.log('unprocessed relays', 
-        this.relays.filter( relay => !this.store.tasks.getProcessed('relays').includes(relay)))
+        this.relays.filter( relay => !this.store.tasks.getProcessed(this.taskSlug).includes(relay)))
 
       if(single) {
         await this.check(single)
@@ -139,25 +142,25 @@ const localMethods = {
   },
 
   completeRelay: function(relay, result){
-    if(this.store.tasks.isProcessed('relays', relay))
+    if(this.store.tasks.isProcessed(this.taskSlug, relay))
       return 
 
-    this.store.tasks.addProcessed('relays', relay)
+    this.store.tasks.addProcessed(this.taskSlug, relay)
     
     if(result)  {
       this.results[relay] = result
       this.setCache(result)
     }
       
-    if(this.store.tasks.getProcessed('relays').length >= this.relays.length)
+    if(this.store.tasks.getProcessed(this.taskSlug).length >= this.relays.length)
       this.completeAll()
   },
 
   completeAll: function(){
     //console.log('completed')
     this.store.tasks.completeJob()
-    // this.store.tasks.finishProcessing('relays')
-    this.store.tasks.updateNow('relays')
+    // this.store.tasks.finishProcessing(this.taskSlug)
+    this.store.tasks.updateNow(this.taskSlug)
     this.store.relays.setAggregateCache('public', Object.keys(this.results).filter( result => this.results[result].aggregate === 'public' ))
     this.store.relays.setAggregateCache('restricted', Object.keys(this.results).filter( result => this.results[result].aggregate === 'restricted' ))
     this.store.relays.setAggregateCache('offline', Object.keys(this.results).filter( result => this.results[result].aggregate === 'offline' ))
@@ -171,7 +174,7 @@ const localMethods = {
           checkLatency: true,          
           getInfo: true,
           getIdentities: true,
-          debug: true,
+          // debug: true,
           connectTimeout: this.getDynamicTimeout,
           readTimeout: this.getDynamicTimeout,
           writeTimeout: this.getDynamicTimeout,
@@ -216,10 +219,10 @@ const localMethods = {
     return Math.floor(parseFloat(sum/total));
   },
   timeUntilRefresh(){
-    return this.timeSince(Date.now()-(this.store.tasks.getLastUpdate('relays')+this.store.prefs.duration-Date.now())) 
+    return this.timeSince(Date.now()-(this.store.tasks.getLastUpdate(this.taskSlug)+this.store.prefs.duration-Date.now())) 
   },
   timeSinceRefresh(){
-    return this.timeSince(this.store.tasks.getLastUpdate('relays')) || Date.now()
+    return this.timeSince(this.store.tasks.getLastUpdate(this.taskSlug)) || Date.now()
   },
 }
 
@@ -233,6 +236,22 @@ export default defineComponent({
       results: results
     }
   },
+  data() {
+    return {
+      relay: "",
+      relays: [],
+      refresh: {},
+      untilNext: null,
+      lastUpdate: null,
+      sinceLast: null,
+      interval: null,
+      windowActive: true,
+      averageLatency: 200,
+      pageOpen: 0,
+      taskSlug: 'relays/check'
+      // history: null
+    }
+  },
   created(){
     clearInterval(this.interval)
     // document.addEventListener("visibilitychange", () => {
@@ -254,7 +273,7 @@ export default defineComponent({
     // document.removeEventListener("visibilitychange", this.handleVisibility, false);
   },
   beforeMount(){
-    this.lastUpdate = this.store.tasks.getLastUpdate('relays')
+    this.lastUpdate = this.store.tasks.getLastUpdate(this.taskSlug)
     this.untilNext = this.timeUntilRefresh()
     this.sinceLast = this.timeSinceRefresh()
     
@@ -274,9 +293,9 @@ export default defineComponent({
   mounted(){
     this.migrateLegacy()
 
-    console.log('is processing', this.store.tasks.isProcessing(`relays`))
+    console.log('is processing', this.store.tasks.isProcessing(this.taskSlug))
 
-    if(this.store.tasks.isProcessing(`relays`))
+    if(this.store.tasks.isProcessing(this.taskSlug))
       this.invalidate(true)
     else
       this.invalidate()
@@ -298,21 +317,6 @@ export default defineComponent({
       }
     },
   },
-  data() {
-    return {
-      relay: "",
-      relays: [],
-      refresh: {},
-      untilNext: null,
-      lastUpdate: null,
-      sinceLast: null,
-      interval: null,
-      windowActive: true,
-      averageLatency: 200,
-      pageOpen: 0,
-      // history: null
-    }
-  },
 })
 </script>
 
diff --git a/src/components/relays/tasks/RelayCanonicalsTask.vue b/src/components/relays/tasks/RelayCanonicalsTask.vue
index 2383635..38776c8 100644
--- a/src/components/relays/tasks/RelayCanonicalsTask.vue
+++ b/src/components/relays/tasks/RelayCanonicalsTask.vue
@@ -1,7 +1,158 @@
 <template>
   
+  <span  
+      v-if="this.store.tasks.getActiveSlug === taskSlug"
+      class="text-white lg:text-sm mr-2 ml-2 mt-1.5 text-xs">
+    <span>Getting canonicals...</span>
+  </span>
 </template>
 
+<style scoped>
+
+</style>
+
 <script>
+import crypto from 'crypto'
+import { RelayPool } from 'nostr'
+
+import { defineComponent, toRefs } from 'vue'
+
+import { setupStore } from '@/store'
+
+import SharedMethods from '@/shared/relays-lib.js'
+import SharedComputed from '@/shared/computed.js'
+
+import { relays } from '../../../../relays.yaml'
+
+const localMethods = {
+  queueJob: function(id, fn, unique){
+    this.store.tasks.addJob({
+      id: id,
+      handler: fn,
+      unique: unique
+    })
+  },
+  invalidate(force){
+    if( (!this.isExpired(this.taskSlug) && !force) ) 
+      return
+    
+    const subid = crypto.randomBytes(40).toString('hex')
+
+    this.queueJob(
+      this.taskSlug, 
+      async () => {
+        const instance = new RelayPool(['wss://nostr.sandwich.farm', 'wss://relay.nostr.ch'])
+
+        instance
+          .on('open', r => {
+            r.subscribe(subid, {
+              limit: 1000,
+              kinds: [1],
+              "#t": ['canonical'],
+              authors:[ 'b3b0d247f66bf40c4c9f4ce721abfe1fd3b7529fbc1ea5e64d5f0f8df3a4b6e6' ]
+            })
+          })
+          .on('event', (relay, _subid, event) => {
+            if(_subid.includes(subid)){
+              console.log('canonical event', event.id)
+              const hash = event.tags.filter( tag => tag[0] === 'h')[0][1]
+              this.hashes[hash] = event.id
+            }
+          })
+
+        await this.delay(5000)
+
+        instance.unsubscribe()
+        instance.close()
+
+        relays.forEach( relay => {
+          const hash = this.hash(relay)
+          if( typeof this.hashes[hash] === "undefined" )
+            return 
+          this.canonicals[relay] = this.hashes[hash] //event.id
+        })
+
+        console.log('hashes found', Object.keys(this.hashes).length)
+        console.log('canonicals found', Object.keys(this.canonicals).length, this.canonicals)
+        console.log('from store', this.store.relays.getCanonicals)
+
+        this.store.relays.setCanonicals(this.canonicals)
+
+        this.store.tasks.completeJob()
+      }, 
+      true
+    )
+  },
+  timeUntilRefresh(){
+    return this.timeSince(Date.now()-(this.store.tasks.getLastUpdate(this.taskSlug)+this.store.prefs.duration-Date.now())) 
+  },
+  timeSinceRefresh(){
+    return this.timeSince(this.store.tasks.getLastUpdate(this.taskSlug)) || Date.now()
+  },
+  hash(relay){
+    return crypto.createHash('md5').update(relay).digest('hex');
+  }
+}
+
+export default defineComponent({
+  name: 'TemplateTask',
+  components: {},
+  data() {
+    return {
+      taskSlug: 'relays/canonicals',
+      canonicals: new Object(),
+      hashes: new Object()
+    }
+  },
+  setup(props){
+    const {resultsProp: results} = toRefs(props)
+    return { 
+      store : setupStore(),
+      results: results
+    }
+  },
+  created(){
+    clearInterval(this.interval)
+  },
+  unmounted(){
+    clearInterval(this.interval)
+  },
+  beforeMount(){
+    this.lastUpdate = this.store.tasks.getLastUpdate(this.taskSlug)
+    this.untilNext = this.timeUntilRefresh()
+    this.sinceLast = this.timeSinceRefresh()
+    
+    this.relays = Array.from(new Set(relays))
+  },
+  mounted(){
+    console.log('task', this.taskSlug, 'is processing:', this.store.tasks.isProcessing(this.taskSlug))
+    if(this.store.tasks.isProcessing(this.taskSlug))
+      this.invalidate(true)
+    else
+      this.invalidate()
+  },
+  updated(){},
+  computed: Object.assign(SharedComputed, {
+    getDynamicTimeout: function(){
+      return this.averageLatency*this.relays.length
+    },
+  }),
+  methods: Object.assign(localMethods, SharedMethods),
+  props: {
+    resultsProp: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+  },
+})
+</script>
+
+<style scoped>
+ #refresh { font-size: 12pt; color:#666; margin-bottom:15px }
+ #refresh button { cursor: pointer; border-radius: 3px; border: 1px solid #a0a0a0; color:#333 }
+ #refresh button:hover {color:#000;}
+ #refresh button[disabled] {color:#999 !important; border-color:#e0e0e0}
+</style>
 
-</script>
\ No newline at end of file
diff --git a/src/components/relays/tasks/RelayOperatorTask.vue b/src/components/relays/tasks/RelayOperatorTask.vue
new file mode 100644
index 0000000..b718220
--- /dev/null
+++ b/src/components/relays/tasks/RelayOperatorTask.vue
@@ -0,0 +1,164 @@
+<template>
+  <span 
+      v-if="this.store.tasks.getActiveSlug === taskSlug"
+      class="text-white lg:text-sm mr-2 ml-2 mt-1.5 text-xs">
+    <span>Retrieving operator profiles...</span>
+  </span>
+</template>
+
+<style scoped>
+
+</style>
+
+<script>
+import { defineComponent, toRefs } from 'vue'
+
+import crypto from 'crypto'
+
+import { setupStore } from '@/store'
+
+import { RelayPool } from 'nostr'
+
+import SharedMethods from '@/shared/relays-lib.js'
+import SharedComputed from '@/shared/computed.js'
+
+import { relays } from '../../../../relays.yaml'
+
+const localMethods = {
+  queueJob: function(id, fn, unique){
+    this.store.tasks.addJob({
+      id: id,
+      handler: fn,
+      unique: unique
+    })
+  },
+  invalidate(force){
+    if( !this.isExpired(this.taskSlug) && !force ) 
+      return
+
+    this.queueJob(
+      this.taskSlug,
+      () => {
+        const relays = this.store.relays.getAggregateCache('public')
+
+        console.log('public relays', this.store.relays.getAggregateCache('public').length)
+
+        const pool = new RelayPool(relays)
+        const subid = crypto.randomBytes(40).toString('hex')
+        const uniques = {
+          0: new Set(),
+          1: new Set(),
+          7: new Set(),
+        }
+
+        const limits = {
+          0: 1,
+          1: 20,
+          7: 100
+        } 
+
+        const kinds = [0,1,7]
+        //remove kind 1 for non-single page tasks
+        pool
+          .on('open', relay => {
+            relay.subscribe(subid, { limit:10, kinds:kinds, authors:[this.result.info.pubkey] })
+          })
+          .on('event', (relay, sub_id, event) => {
+            console.log(event)
+            if(!kinds.includes(event.kind))
+              return
+            if(sub_id !== subid)
+              return
+            const u = uniques[event.kind],
+                  l = limits[event.kind]
+            if( u.has(event.id) || u.size > l )
+              return
+            if( !(event instanceof Object) )
+              return
+            
+            if( !( this.events[event.kind] instanceof Object ))
+              this.events[event.kind] = new Object()
+            this.events[event.kind][event.id] = event
+            u.add(event.id)
+            if(event.kind === 0)
+              this.store.profile.setProfile(JSON.parse(event.content)).catch()
+            console.log(`kind: ${event.kind} found`, '... total',  u.size, Object.keys(this.events[event.kind]).length)
+            console.log( 'event!', event.content )
+          })
+
+        this.store.tasks.completeJob()
+          // .on('eose', relay => {
+          //   relay.close()
+          // })
+      },
+      true 
+    )
+  },
+  timeUntilRefresh(){
+    return this.timeSince(Date.now()-(this.store.tasks.getLastUpdate(this.taskSlug)+this.store.prefs.duration-Date.now())) 
+  },
+  timeSinceRefresh(){
+    return this.timeSince(this.store.tasks.getLastUpdate(this.taskSlug)) || Date.now()
+  },
+}
+
+export default defineComponent({
+  name: 'TemplateTask',
+  components: {},
+  data() {
+    return {
+      taskSlug: 'relays/operatorprofiles'
+    }
+  },
+  setup(props){
+    const {resultsProp: results} = toRefs(props)
+    return { 
+      store : setupStore(),
+      results: results
+    }
+  },
+  created(){
+    clearInterval(this.interval)
+  },
+  unmounted(){
+    clearInterval(this.interval)
+  },
+  beforeMount(){
+    this.lastUpdate = this.store.tasks.getLastUpdate(this.taskSlug)
+    this.untilNext = this.timeUntilRefresh()
+    this.sinceLast = this.timeSinceRefresh()
+    
+    this.relays = Array.from(new Set(relays))
+  },
+  mounted(){
+    console.log('task', this.taskSlug, 'is processing:', this.store.tasks.isProcessing(this.taskSlug))
+    if(this.store.tasks.isProcessing(this.taskSlug))
+      this.invalidate(true)
+    else
+      this.invalidate()
+  },
+  updated(){},
+  computed: Object.assign(SharedComputed, {
+    getDynamicTimeout: function(){
+      return this.averageLatency*this.relays.length
+    },
+  }),
+  methods: Object.assign(localMethods, SharedMethods),
+  props: {
+    resultsProp: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+  },
+})
+</script>
+
+<style scoped>
+ #refresh { font-size: 12pt; color:#666; margin-bottom:15px }
+ #refresh button { cursor: pointer; border-radius: 3px; border: 1px solid #a0a0a0; color:#333 }
+ #refresh button:hover {color:#000;}
+ #refresh button[disabled] {color:#999 !important; border-color:#e0e0e0}
+</style>
+
diff --git a/src/components/relays/tasks/TasksManager.vue b/src/components/relays/tasks/TasksManager.vue
index a57dbc9..94b2b22 100644
--- a/src/components/relays/tasks/TasksManager.vue
+++ b/src/components/relays/tasks/TasksManager.vue
@@ -1,10 +1,10 @@
 <template>
   <RefreshTask
-    v-if="showRefreshRelays"
-    v-bind:resultsProp="results" />
-  <RelayCanonicalsTask
-    v-else-if="showGetRelayCanonicals"
     v-bind:resultsProp="results" />
+  <!-- <RelayCanonicalsTask
+    :resultsProp="results" />
+  <RelayOperatorTask
+    :resultsProp="results" /> -->
 </template>
 
 <script>
@@ -16,11 +16,15 @@ import { setupStore } from '@/store'
 import SharedComputed from '@/shared/computed.js'
 
 import RefreshTask from './RefreshTask.vue'
+// import RelayCanonicalsTask from './RelayCanonicalsTask.vue'
+// import RelayOperatorTask from './RelayOperatorTask.vue'
 
 export default defineComponent({
   name: "TasksManager",
   components: {
-    RefreshTask
+    RefreshTask,
+    // RelayCanonicalsTask,
+    // RelayOperatorTask
   },
   setup(props){
     const {resultsProp: results} = toRefs(props)
@@ -60,37 +64,6 @@ export default defineComponent({
   },
   computed: Object.assign(SharedComputed, {
     path: function() { return useRoute().path },
-    showRefreshRelays: function(){
-      return ( 
-                this.path.includes('/relays/find')
-                || this.path.includes(`/relay/`)
-              ) 
-              && 
-              (
-                ( 
-                  this.store.tasks.isProcessing('relays') 
-                  && this.store.tasks.currentTask == 'relays'
-                )
-                || 
-                (
-                  !this.store.tasks.isAnyProcessing
-                )
-              )
-    },
-    showGetRelayCanonicals: function(){
-      return (
-              ( 
-                this.store.tasks.isProcessing('relays/canonicals') 
-                && this.store.tasks.currentTask == 'relays/canonicals'
-              )
-              || 
-              (
-                !this.store.tasks.isAnyProcessing
-              )
-            )
-            &&
-            this.isExpired('relays/canonicals')
-    }
   })
 });
 </script>
\ No newline at end of file
diff --git a/src/components/relays/tasks/TemplateTask.vue b/src/components/relays/tasks/TemplateTask.vue
new file mode 100644
index 0000000..9ad700f
--- /dev/null
+++ b/src/components/relays/tasks/TemplateTask.vue
@@ -0,0 +1,106 @@
+<template>
+  
+  <span class="text-white lg:text-sm mr-2 ml-2 mt-1.5 text-xs">
+    <span">Task Status here</span>
+  </span>
+</template>
+
+<style scoped>
+
+</style>
+
+<script>
+import { defineComponent, toRefs } from 'vue'
+
+import { setupStore } from '@/store'
+
+import SharedMethods from '@/shared/relays-lib.js'
+import SharedComputed from '@/shared/computed.js'
+
+import { relays } from '../../../../relays.yaml'
+
+const localMethods = {
+  queueJob: function(id, fn, unique){
+    this.store.tasks.addJob({
+      id: id,
+      handler: fn,
+      unique: unique
+    })
+  },
+  invalidate(force){
+    if( (!this.isExpired(this.taskSlug) && !force) ) 
+      return
+  },
+  timeUntilRefresh(){
+    return this.timeSince(Date.now()-(this.store.tasks.getLastUpdate(this.taskSlug)+this.store.prefs.duration-Date.now())) 
+  },
+  timeSinceRefresh(){
+    return this.timeSince(this.store.tasks.getLastUpdate(this.taskSlug)) || Date.now()
+  },
+}
+
+export default defineComponent({
+  name: 'TemplateTask',
+  components: {},
+  data() {
+    return {
+      taskSlug: 'relays/*'
+    }
+  },
+  setup(props){
+    const {resultsProp: results} = toRefs(props)
+    return { 
+      store : setupStore(),
+      results: results
+    }
+  },
+  created(){
+    clearInterval(this.interval)
+  },
+  unmounted(){
+    clearInterval(this.interval)
+  },
+  beforeMount(){
+    this.lastUpdate = this.store.tasks.getLastUpdate(this.taskSlug)
+    this.untilNext = this.timeUntilRefresh()
+    this.sinceLast = this.timeSinceRefresh()
+    
+    this.relays = Array.from(new Set(relays))
+  },
+  mounted(){
+    this.migrateLegacy()
+
+    console.log('is processing', this.store.tasks.isProcessing(this.taskSlug))
+
+    if(this.store.tasks.isProcessing(this.taskSlug))
+      this.invalidate(true)
+    else
+      this.invalidate()
+
+    this.setRefreshInterval()
+  },
+  updated(){},
+  computed: Object.assign(SharedComputed, {
+    getDynamicTimeout: function(){
+      return this.averageLatency*this.relays.length
+    },
+  }),
+  methods: Object.assign(localMethods, SharedMethods),
+  props: {
+    resultsProp: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+  },
+})
+</script>
+
+<style scoped>
+ #refresh { font-size: 12pt; color:#666; margin-bottom:15px }
+ #refresh button { cursor: pointer; border-radius: 3px; border: 1px solid #a0a0a0; color:#333 }
+ #refresh button:hover {color:#000;}
+ #refresh button[disabled] {color:#999 !important; border-color:#e0e0e0}
+</style>
+
diff --git a/src/components/user/AuthComponent.vue b/src/components/user/AuthComponent.vue
index efde57f..4ebb10f 100644
--- a/src/components/user/AuthComponent.vue
+++ b/src/components/user/AuthComponent.vue
@@ -91,24 +91,24 @@ export default defineComponent({
       })
     },
 
-    generateCodeChallenge: async function(codeVerifier) {
-      let digest = await crypto.subtle.digest("SHA-256",
-          new TextEncoder().encode(codeVerifier));
+    // generateCodeChallenge: async function(codeVerifier) {
+    //   let digest = await crypto.subtle.digest("SHA-256",
+    //       new TextEncoder().encode(codeVerifier));
 
-      return btoa(String.fromCharCode(...new Uint8Array(digest)))
-          .replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_')
-    },
+    //   return btoa(String.fromCharCode(...new Uint8Array(digest)))
+    //       .replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_')
+    // },
 
-    generateRandomString: function(length) {
-      let text = "";
-      let possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    // generateRandomString: function(length) {
+    //   let text = "";
+    //   let possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 
-      for (let i = 0; i < length; i++) {
-          text += possible.charAt(Math.floor(Math.random() * possible.length));
-      }
+    //   for (let i = 0; i < length; i++) {
+    //       text += possible.charAt(Math.floor(Math.random() * possible.length));
+    //   }
 
-      return text;
-    },
+    //   return text;
+    // },
   }),
   props: {},
 })
diff --git a/src/store/profiles.js b/src/store/profiles.js
index 4abdd55..aa49b74 100644
--- a/src/store/profiles.js
+++ b/src/store/profiles.js
@@ -10,7 +10,7 @@ export const useProfileStore = defineStore('profiles', {
   }),
   getters: {},
   actions: {
-    set(profile){ 
+    setProfile(profile){ 
       Object.keys(profile).forEach( key => {
         if( !(profile[key] instanceof String) )
           return 
diff --git a/src/store/relays.js b/src/store/relays.js
index a0a2608..2667dbd 100644
--- a/src/store/relays.js
+++ b/src/store/relays.js
@@ -49,7 +49,8 @@ export const useRelaysStore = defineStore('relays', {
 
     getAggregateCache: state => aggregate => state.cached[aggregate] instanceof Array ? state.cached[aggregate] : [],
 
-    getCanonical: state => relay => state.canonicals[relay]
+    getCanonicals: state => state.canonicals,
+    getCanonical: state => relay => state.canonicals[relay],
   },
   actions: {
     addRelay(relayUrl){ this.urls.push(relayUrl) },
@@ -99,6 +100,10 @@ export const useRelaysStore = defineStore('relays', {
       if( !(this.cached[aggregate] instanceof Array) )
         this.cached[aggregate] = new Array()
       this.cached[aggregate] = array
+    },
+
+    setCanonicals(c){
+      this.canonicals = c
     }
   },
 })
\ No newline at end of file
diff --git a/src/store/tasks.js b/src/store/tasks.js
index 5cd288a..a255323 100644
--- a/src/store/tasks.js
+++ b/src/store/tasks.js
@@ -37,7 +37,6 @@ export const useTaskStore = defineStore('tasks', {
     isActive: (state) => Object.keys( state.active ).length > 0,
     isIdle: (state) => Object.keys( state.active ).length == 0,
     arePending: (state) => state.pending.length > 0,
-
   },
   actions: {
     updateNow(key){ this.lastUpdate[key] = Date.now() },
@@ -69,6 +68,7 @@ export const useTaskStore = defineStore('tasks', {
     },
     completeJob(){
       console.log('compelteJob', this.active.id, this.active)
+      this.updateNow(this.active.id)
       this.finishProcessing(this.active.id)
       this.completed.push(this.active)
       this.startNextJob()

From c276d05ea65d932c453c336df516b412dbe26a8f Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 22:37:33 +0100
Subject: [PATCH 12/20] Fix grammatical error

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17772a2..306f4f4 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 A client-side nostr network status built with Vue3, Pinia, [nostr-tools](https://github.com/fiatjaf/nostr-tools), [nostr-js](https://github.com/jb55/nostr-js) and [nostr-relay-inspector](https://github.com/dskvr/nostr-relay-inspector). 
 
-nostr.watch aggregates various datapoints nostr relays and the network in general to assist users, developers and relay operators. 
+nostr.watch aggregates data on nostr relays and the network in general to assist users, developers and relay operators. 
 
 Develop branch is deployed to https://next.nostr.watch
 

From a4a54f44f9d21c1575228d613c91443c9ad5bd2b Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:09:22 +0100
Subject: [PATCH 13/20] found the gremlin, event handler slug changed to
 completed instead of complete, scratches head

---
 package.json                                  |  2 +-
 .../relays/blocks/RelaysResultTable.vue       | 24 +++++++++----------
 src/components/relays/tasks/RefreshTask.vue   | 17 +++++++------
 src/components/relays/tasks/TasksManager.vue  |  5 ++--
 src/store/tasks.js                            |  4 +---
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 2d9c9be..f16a630 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "node-emoji": "1.11.0",
     "node-fetch": "3.3.0",
     "nostr": "0.2.5",
-    "nostr-relay-inspector": "0.0.23",
+    "nostr-relay-inspector": "0.0.24",
     "nostr-tools": "1.1.1",
     "object-sizeof": "1.6.3",
     "onion-regex": "2.0.8",
diff --git a/src/components/relays/blocks/RelaysResultTable.vue b/src/components/relays/blocks/RelaysResultTable.vue
index 49f2a3c..b66c199 100644
--- a/src/components/relays/blocks/RelaysResultTable.vue
+++ b/src/components/relays/blocks/RelaysResultTable.vue
@@ -27,9 +27,7 @@
                           </label>
                         </span>
                       </th>
-                      <th scope="col" class="relative py-3.5 pl-0 pr-0 sm:pr-0">
-                        <code class="text-xs block">Favorite</code>
-                      </th>
+                      
                       <!-- <th scope="col" class="relative py-3.5 pl-0 pr-0 sm:pr-0" v-if="isLoggedIn()">
                         <code class="text-xs block">Upvote</code>
                       </th> -->
@@ -59,6 +57,9 @@
                         <code class="text-xs block">Write</code>
                         <!-- ✏️ -->
                       </th>
+                      <th scope="col" class="relative py-3.5 pl-0 pr-0 sm:pr-0">
+                        <code class="text-xs block">Favorite</code>
+                      </th>
                     </tr>
                 </thead>
                 <tbody class="divide-y divide-gray-200 bg-white">
@@ -77,15 +78,6 @@
                         <a :href="`/relay/${relayClean(relay)}`">{{ relay.replace('wss://', '') }}</a>
                       </td>
 
-                      <td class="w-16 fav text-center">
-                        <a
-                          class="hover:opacity-100 cursor-pointer" 
-                          :class="store.relays.isFavorite(relay) ? 'opacity-100' : 'opacity-10'"
-                          @click="store.relays.toggleFavorite(relay)">
-                          ❤️
-                        </a>
-                      </td>
-
                       <!-- <td class="w-16 fav text-center" v-if="isLoggedIn()">
                         <a
                           class=" hover:opacity-100 cursor-pointer opacity-20" 
@@ -127,6 +119,14 @@
                         <span class="m-auto block" :class="getCheckIndicator(relay, 'write')">&nbsp;</span>
                       </td>
 
+                      <td class="w-16 fav text-center">
+                        <a
+                          class="hover:opacity-100 cursor-pointer" 
+                          :class="store.relays.isFavorite(relay) ? 'opacity-100' : 'opacity-10'"
+                          @click="store.relays.toggleFavorite(relay)">
+                          ❤️
+                        </a>
+                      </td>
                       
                     </tr>
                 </tbody>
diff --git a/src/components/relays/tasks/RefreshTask.vue b/src/components/relays/tasks/RefreshTask.vue
index 2ae4460..cb09950 100644
--- a/src/components/relays/tasks/RefreshTask.vue
+++ b/src/components/relays/tasks/RefreshTask.vue
@@ -137,7 +137,7 @@ const localMethods = {
       } 
     }, true)
 
-    console.log('queue', this.store.tasks.getActive)
+    // console.log('queue', this.store.tasks.getActive)
     
   },
 
@@ -169,7 +169,7 @@ const localMethods = {
   },
 
   check: async function(relay){
-    return new Promise( (resolve, reject) => {
+    return new Promise( (resolve) => {
       const opts = {
           checkLatency: true,          
           getInfo: true,
@@ -187,6 +187,7 @@ const localMethods = {
 
       socket
         .on('complete', (instance) => {
+          // console.log('completed?', instance.result)
           instance.result.aggregate = this.getAggregate(instance.result)
           instance.relay.close()
           instance.result.log = instance.log
@@ -194,10 +195,11 @@ const localMethods = {
         })
         .on('close', () => {
           //console.log(`${relay.url} has closed`)
-          reject()
+          // reject()
         })
-        .on('error', () => {
-          reject()
+        .on('error', (result) => {
+          console.log(result)
+          // reject()
         })
         .run()
     })
@@ -293,7 +295,7 @@ export default defineComponent({
   mounted(){
     this.migrateLegacy()
 
-    console.log('is processing', this.store.tasks.isProcessing(this.taskSlug))
+    // console.log('is processing', this.store.tasks.isProcessing(this.taskSlug))
 
     if(this.store.tasks.isProcessing(this.taskSlug))
       this.invalidate(true)
@@ -305,7 +307,8 @@ export default defineComponent({
   updated(){},
   computed: Object.assign(SharedComputed, {
     getDynamicTimeout: function(){
-      return this.averageLatency*this.relays.length
+      const calculated = this.averageLatency*this.relays.length
+      return calculated > 10000 ? calculated : 10000
     },
   }),
   methods: Object.assign(localMethods, RelaysLib),
diff --git a/src/components/relays/tasks/TasksManager.vue b/src/components/relays/tasks/TasksManager.vue
index 94b2b22..a22a29a 100644
--- a/src/components/relays/tasks/TasksManager.vue
+++ b/src/components/relays/tasks/TasksManager.vue
@@ -41,7 +41,6 @@ export default defineComponent({
   },
   mounted(){
     this.store.tasks.$subscribe( (mutation) => {
-      console.log('mutation', mutation.events)
       if(mutation.events.key === 'currentTask')
         this.processJob()
     })
@@ -55,10 +54,10 @@ export default defineComponent({
   },
   methods: {
     processJob(){
-      console.log('trying processJob()')
+      // console.log('trying processJob()')
       if(!this.store.tasks.active?.handler)
         return 
-      console.log('processJob()', this.store.tasks.active.id)
+      // console.log('processJob()', this.store.tasks.active.id)
       this.store.tasks.active.handler()
     }
   },
diff --git a/src/store/tasks.js b/src/store/tasks.js
index a255323..a3d5f70 100644
--- a/src/store/tasks.js
+++ b/src/store/tasks.js
@@ -55,20 +55,18 @@ export const useTaskStore = defineStore('tasks', {
         this.startNextJob()
     },
     startNextJob(){
-      console.log('task, isactive?', this.isActive)
       if( this.arePending ) {
         this.active = this.pending[0]
         this.pending.shift()
         this.startProcessing(this.active)
       }
       else {
-        console.log('completing active...')
         this.active = {}
       }
     },
     completeJob(){
-      console.log('compelteJob', this.active.id, this.active)
       this.updateNow(this.active.id)
+      //there's a NaN flash, might need a delay.
       this.finishProcessing(this.active.id)
       this.completed.push(this.active)
       this.startNextJob()

From dcd71978f7a48bd1deda9b670dbe60db9e258f2e Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:14:21 +0100
Subject: [PATCH 14/20] bump nostr-relay-inspector

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f16a630..4c61f18 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "node-emoji": "1.11.0",
     "node-fetch": "3.3.0",
     "nostr": "0.2.5",
-    "nostr-relay-inspector": "0.0.24",
+    "nostr-relay-inspector": "0.0.25",
     "nostr-tools": "1.1.1",
     "object-sizeof": "1.6.3",
     "onion-regex": "2.0.8",
diff --git a/yarn.lock b/yarn.lock
index a4d4ba2..013b44e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6393,10 +6393,10 @@ normalize-url@^6.0.1:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-nostr-relay-inspector@0.0.23:
-  version "0.0.23"
-  resolved "https://registry.yarnpkg.com/nostr-relay-inspector/-/nostr-relay-inspector-0.0.23.tgz#86f3ea8a23ea1beccd18ec93db1339434679a798"
-  integrity sha512-G1xVvUM+PajNaZb8bAn7MGcDQL81YhKDEky1Lv2oGl0STWfrSb9KnJpSMrS8Rx/YRmGtqiNWIMfRokDCIyrKNw==
+nostr-relay-inspector@0.0.25:
+  version "0.0.25"
+  resolved "https://registry.yarnpkg.com/nostr-relay-inspector/-/nostr-relay-inspector-0.0.25.tgz#8ddd0872d4529d4376b2254f32e3da2d9278963f"
+  integrity sha512-Xq1Y4coTC/Qd/axdGIZm6bejs6mF3A9UoHqQI8eDTGUOOvcyCIZcmowFUBkIBIVkCGCD/0DfD3vLG78Xi8oH+Q==
   dependencies:
     cross-fetch "3.1.5"
     js-yaml "4.1.0"

From 1359cbcf288262e07e65deb63e57b5ad40ce4433 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:17:37 +0100
Subject: [PATCH 15/20] remove some console logs

---
 src/components/relays/tasks/RefreshTask.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/relays/tasks/RefreshTask.vue b/src/components/relays/tasks/RefreshTask.vue
index cb09950..399169a 100644
--- a/src/components/relays/tasks/RefreshTask.vue
+++ b/src/components/relays/tasks/RefreshTask.vue
@@ -193,15 +193,16 @@ const localMethods = {
           instance.result.log = instance.log
           resolve(instance.result)
         })
-        .on('close', () => {
-          //console.log(`${relay.url} has closed`)
-          // reject()
-        })
-        .on('error', (result) => {
-          console.log(result)
-          // reject()
-        })
         .run()
+        // .on('close', () => {
+        //   //console.log(`${relay.url} has closed`)
+        //   // reject()
+        // })
+        // .on('error', () => {
+        //   // console.log(result)
+        //   // reject()
+        // })
+        
     })
   },
   

From ce8b526fb493f61df176ca4ef70c6040e0ce7d0b Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:30:41 +0100
Subject: [PATCH 16/20] bump version and hotfix production pinia

---
 package.json                                 | 2 +-
 src/components/relays/tasks/TasksManager.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4c61f18..e2542f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nostr-watch",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build",
diff --git a/src/components/relays/tasks/TasksManager.vue b/src/components/relays/tasks/TasksManager.vue
index a22a29a..410cbc4 100644
--- a/src/components/relays/tasks/TasksManager.vue
+++ b/src/components/relays/tasks/TasksManager.vue
@@ -41,7 +41,7 @@ export default defineComponent({
   },
   mounted(){
     this.store.tasks.$subscribe( (mutation) => {
-      if(mutation.events.key === 'currentTask')
+      if(mutation.events?.key === 'currentTask')
         this.processJob()
     })
     this.processJob()

From e90a5c09f3e6355485ef4eb9277219e284fb4025 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:42:40 +0100
Subject: [PATCH 17/20] remove , it's dev only

---
 src/components/relays/tasks/TasksManager.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/relays/tasks/TasksManager.vue b/src/components/relays/tasks/TasksManager.vue
index 410cbc4..d1291c2 100644
--- a/src/components/relays/tasks/TasksManager.vue
+++ b/src/components/relays/tasks/TasksManager.vue
@@ -26,6 +26,11 @@ export default defineComponent({
     // RelayCanonicalsTask,
     // RelayOperatorTask
   },
+  data(){
+    return {
+      interval: null
+    }
+  },
   setup(props){
     const {resultsProp: results} = toRefs(props)
     return { 
@@ -40,12 +45,15 @@ export default defineComponent({
     this.store.tasks.completed = new Array()
   },
   mounted(){
-    this.store.tasks.$subscribe( (mutation) => {
-      if(mutation.events?.key === 'currentTask')
-        this.processJob()
-    })
+    this.interval = setInterval( () => {
+      if(this.store.tasks.currentTask)
+      this.processJob()
+    }, 1000)
     this.processJob()
   },
+  unmounted(){
+    clearInterval(this.interval)
+  },
   props: {
     resultsProp: {
       type: String,

From b6d190906965072b1ebf5d67fb2c3d913ac2e158 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:56:11 +0100
Subject: [PATCH 18/20] remove problematic relay until timeouts exist on fetch

---
 relays.yaml                                  |  1 -
 src/components/relays/tasks/TasksManager.vue | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/relays.yaml b/relays.yaml
index eb92612..50bf32a 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -198,6 +198,5 @@ relays:
   - wss://relay.nostrprotocol.net
   - wss://nostr.easydns.ca
   - wss://nostr.bostonbtc.com
-  - "wss://knostr.neutrine.com:8880"
   - wss://no-str.org
   - wss://nostr.thesimplekid.com
diff --git a/src/components/relays/tasks/TasksManager.vue b/src/components/relays/tasks/TasksManager.vue
index d1291c2..5663ced 100644
--- a/src/components/relays/tasks/TasksManager.vue
+++ b/src/components/relays/tasks/TasksManager.vue
@@ -28,7 +28,8 @@ export default defineComponent({
   },
   data(){
     return {
-      interval: null
+      interval: null,
+      currentTask: null
     }
   },
   setup(props){
@@ -45,9 +46,12 @@ export default defineComponent({
     this.store.tasks.completed = new Array()
   },
   mounted(){
+    this.currentTask = this.store.tasks.currentTask
     this.interval = setInterval( () => {
-      if(this.store.tasks.currentTask)
+      if(this.currentTask === this.store.tasks.currentTask)
+        return 
       this.processJob()
+      this.currentTask = this.store.tasks.currentTask
     }, 1000)
     this.processJob()
   },
@@ -56,8 +60,10 @@ export default defineComponent({
   },
   props: {
     resultsProp: {
-      type: String,
-      default: "Tooltip text",
+      type: Object,
+      default(){
+        return {}
+      }
     },
   },
   methods: {
@@ -65,7 +71,6 @@ export default defineComponent({
       // console.log('trying processJob()')
       if(!this.store.tasks.active?.handler)
         return 
-      // console.log('processJob()', this.store.tasks.active.id)
       this.store.tasks.active.handler()
     }
   },

From 8cda3bc0d8051681d1ecc35e8feedf3136574d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luiz=20Pican=C3=A7o?= <lpicanco@gmail.com>
Date: Tue, 10 Jan 2023 00:59:33 +0000
Subject: [PATCH 19/20] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index 50bf32a..4b9bab9 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -200,3 +200,4 @@ relays:
   - wss://nostr.bostonbtc.com
   - wss://no-str.org
   - wss://nostr.thesimplekid.com
+  - wss://knostr.neutrine.com

From 9939cab76a6f874a7a9983571d7bd8906f230dd2 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Tue, 10 Jan 2023 03:20:05 +0100
Subject: [PATCH 20/20] quick fix for relays without nip-11 single pages

---
 src/components/relays/pages/RelaysSingle.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/relays/pages/RelaysSingle.vue b/src/components/relays/pages/RelaysSingle.vue
index a908535..6d8c97e 100644
--- a/src/components/relays/pages/RelaysSingle.vue
+++ b/src/components/relays/pages/RelaysSingle.vue
@@ -121,7 +121,7 @@
 
         
 
-        <div class="py-5 col-span-3" v-if="Object.keys(result?.info).length">
+        <div class="py-5 col-span-3" v-if="typeof result?.info !== 'undefined'">
           <div class="overflow-hidden bg-white shadow sm:rounded-lg relative">
             <div class="px-4 py-5 sm:px-6">
               <h3 class="text-lg md:text1xl lg:text-2xl xl:text-3xl">Relay Info <code class="text-gray-300 text-xs absolute top-3 right-3">NIP-11</code></h3>