Merge pull request #649 from dskvr/develop

Update nostrwatch-js and non-compliant relay additions

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-watch",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build",
@@ -39,7 +39,7 @@
     "node-fetch": "3.3.0",
     "nostr": "0.2.5",
     "nostr-tools": "1.1.1",
-    "nostrwatch-js": "0.0.43",
+    "nostrwatch-js": "0.0.48",
     "object-hash": "3.0.0",
     "object-sizeof": "1.6.3",
     "onion-regex": "2.0.8",

relays.yaml

@@ -1,4 +1,5 @@
 relays:
+- wss://sg.unfiltered.zone
 - wss://relay.nostrfiles.dev
 - wss://nostr.coinfundit.com
 - wss://relay.verified-nostr.com
@@ -48,7 +49,9 @@ relays:
 - wss://nostr-01.bolt.observer
 - wss://nostr-01.dorafactory.org
 - wss://nostr-02.dorafactory.org
+- wss://nostr-03.dorafactory.org
 - wss://nostr-01.yakihonne.com
+- wss://relay.yakihonne.com
 - wss://nostr-1.afarazit.eu
 - wss://nostr-1.nbo.angani.co
 - wss://nostr-2.afarazit.eu
@@ -465,9 +468,12 @@ relays:
 - wss://th1.nostr.earnkrub.xyz
 - wss://th2.nostr.earnkrub.xyz
 - wss://relay.piazza.today
+- wss://th1.nostream.earnkrub.xyz
+- wss://nostrasia.casa
+- wss://relay.nostr.jabber.ch
 - wss://relay.nostr.smoak.haus
 - wss://nostr.dehein.org
 - wss://ftp.halifax.rwth-aachen.de/nostr
 - wss://nostr.sixteensixtyone.com
 - wss://nostr.1661.io
-- wss://ftp.halifax.rwth-aachen.de/nostr
+- wss://ftp.halifax.rwth-aachen.de/nostr

yarn.lock

@@ -2334,6 +2334,16 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
+[email protected], ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -2344,16 +2354,6 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
 ansi-colors@^4.1.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
@@ -2476,6 +2476,11 @@ arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
+
 asn1.js@^5.2.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
@@ -6803,18 +6808,20 @@ [email protected]:
     noble-secp256k1 "^1.2.14"
     ws "^8.8.1"
 
-[email protected].43:
-  version "0.0.43"
-  resolved "https://registry.yarnpkg.com/nostrwatch-js/-/nostrwatch-js-0.0.43.tgz#146b395be982228c5944956ef0fd46a3d30d4ec1"
-  integrity sha512-du3D5K2XjNqfmF37gXAC2c+oifRfIUQ9t706N3lr/kOksgyhWp5iKoyATT9xscmY54mwNzMS3qp+DXb9BdIqHw==
+[email protected].48:
+  version "0.0.48"
+  resolved "https://registry.yarnpkg.com/nostrwatch-js/-/nostrwatch-js-0.0.48.tgz#8263a9318888a45bac3df0a32add8f7872de12de"
+  integrity sha512-jP1vztYbT7abJQaXOeJB4h7kmKorSTcauG/+ZLYH3XHfYqUc+fL2L5cQDVoxuJ9z1rLg6AcaehzNRHA9yTbDyA==
   dependencies:
+    ajv "8.12.0"
     convert-vapid-public-key "1.1.0"
     cross-fetch "3.1.5"
     js-yaml "4.1.0"
     node-fetch "3.3.0"
     nostr "0.2.7"
     nostr-tools "1.7.4"
     p-queue "7.3.4"
+    promise-deferred "2.0.3"
     tape "5.6.1"
 
 npm-run-path@^2.0.0:
@@ -7905,6 +7912,13 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+[email protected]:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/promise-deferred/-/promise-deferred-2.0.3.tgz#b99c9588820798501862a593d49cece51d06fd7f"
+  integrity sha512-n10XaoznCzLfyPFOlEE8iurezHpxrYzyjgq/1eW9Wk1gJwur/N7BdBmjJYJpqMeMcXK4wEbzo2EvZQcqjYcKUQ==
+  dependencies:
+    promise "^7.3.1"
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -7918,6 +7932,13 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
+promise@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"