nappup 2.3.6 → 2.3.7

package/package.json

@@ -6,7 +6,7 @@
     "url": "git+https://github.com/44billion/nappup.git"
   },
   "license": "MIT",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Nostr App Uploader",
   "type": "module",
   "scripts": {
@@ -22,7 +22,7 @@
     "@noble/hashes": "^2.0.0",
     "dotenv": "^17.2.0",
     "file-type": "^21.0.0",
-    "libp2r2p": "^0.10.5",
+    "libp2r2p": "^0.10.6",
     "mime-types": "^3.0.1",
     "nmmr": "^2.0.0"
   },

package/src/helpers/signer.js

@@ -1,27 +1,18 @@
-import nostrRelays, { seedRelays, freeRelays } from '#services/nostr-relays.js'
+import { freeRelays, getRelaysByPubkey } from 'libp2r2p/relay'
 
-export async function getRelays () {
+export async function getRelays ({ _getRelaysByPubkey = getRelaysByPubkey } = {}) {
   if (this.relays) return this.relays
 
-  const relayLists = (await nostrRelays.getEvents({ authors: [await this.getPublicKey()], kinds: [10002], limit: 1 }, seedRelays)).result
-  const relayList = relayLists.sort((a, b) => b.created_at - a.created_at)[0]
-  const rTags = (relayList?.tags ?? []).filter(v => v[0] === 'r' && /^wss?:\/\//.test(v[1]))
-  if (rTags.length === 0) {
+  const pubkey = await this.getPublicKey()
+  const relaysByPubkey = await _getRelaysByPubkey([pubkey])
+  const relays = relaysByPubkey[pubkey]
+  if (!relays.read.length && !relays.write.length) {
     const defaults = freeRelays.slice(0, 2)
-    return (this.relays = { read: defaults, write: defaults })
+    relays.read.push(...defaults)
+    relays.write.push(...defaults)
   }
-
-  let keys
-  const keyAllowList = { read: true, write: true }
-  const relays = rTags.reduce((r, v) => {
-    keys = [v[2]].filter(v2 => keyAllowList[v2])
-    if (keys.length === 0) keys = ['read', 'write']
-    keys.forEach(k => r[k].push(v[1].trim().replace(/\/$/, '')))
-    return r
-  }, { read: [], write: [] })
   for (const k in relays) {
     if (relays[k].length === 0) relays[k].push(...freeRelays)
-    relays[k] = [...new Set(relays[k])]
   }
   return (this.relays = relays)
 }