nappup 1.5.7 → 1.5.8

package/package.json

@@ -6,7 +6,7 @@
     "url": "git+https://github.com/44billion/nappup.git"
   },
   "license": "MIT",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "Nostr App Uploader",
   "type": "module",
   "scripts": {

package/src/index.js

@@ -23,7 +23,7 @@ export async function toApp (fileList, nostrSigner, { log = () => {}, dTag, dTag
   if (typeof window !== 'undefined' && nostrSigner === window.nostr) {
     nostrSigner.getRelays = NostrSigner.prototype.getRelays
   }
-  const writeRelays = (await nostrSigner.getRelays()).write
+  const writeRelays = [...new Set((await nostrSigner.getRelays()).write.map(r => r.trim().replace(/\/$/, '')))]
   log(`Found ${writeRelays.length} outbox relays for pubkey ${nostrSigner.getPublicKey()}:\n${writeRelays.join(', ')}`)
   if (writeRelays.length === 0) throw new Error('No outbox relays found')
 
@@ -167,7 +167,7 @@ export async function toApp (fileList, nostrSigner, { log = () => {}, dTag, dTag
 
 async function uploadBinaryDataChunks ({ nmmr, signer, filename, chunkLength, log, pause = 0, mimeType, shouldReupload = false }) {
   const writeRelays = (await signer.getRelays()).write
-  const relays = [...new Set([...writeRelays, ...nappRelays])]
+  const relays = [...new Set([...writeRelays, ...nappRelays].map(r => r.trim().replace(/\/$/, '')))]
   let chunkIndex = 0
   for await (const chunk of nmmr.getChunks()) {
     const dTag = chunk.x
@@ -274,7 +274,7 @@ async function throttledSendEvent (event, relays, {
 }
 
 async function getPreviousCtags (dTagValue, currentCtagValue, relays, signer) {
-  const targetRelays = [...new Set([...relays, ...nappRelays])]
+  const targetRelays = [...new Set([...relays, ...nappRelays].map(r => r.trim().replace(/\/$/, '')))]
   const storedEvents = (await nostrRelays.getEvents({
     kinds: [34600],
     authors: [await signer.getPublicKey()],
@@ -333,7 +333,7 @@ async function uploadBundle ({ dTag, channel, fileMetadata, signer, pause = 0, s
     ...fileTags
   ]
 
-  const writeRelays = [...new Set([...(await signer.getRelays()).write, ...nappRelays])]
+  const writeRelays = [...new Set([...(await signer.getRelays()).write, ...nappRelays].map(r => r.trim().replace(/\/$/, '')))]
 
   let mostRecentEvent
   const events = (await nostrRelays.getEvents({
@@ -428,7 +428,7 @@ async function maybeUploadStall ({
   const hasMetadata = Boolean(trimmedName) || Boolean(trimmedSummary) || Boolean(iconRootHash) ||
     Boolean(self) || (countries && countries.length > 0) || (categories && categories.length > 0) || (hashtags && hashtags.length > 0)
 
-  const relays = [...new Set([...writeRelays, ...nappRelays])]
+  const relays = [...new Set([...writeRelays, ...nappRelays].map(r => r.trim().replace(/\/$/, '')))]
 
   const previousResult = await getPreviousStall(dTag, relays, signer, channel)
   const previous = previousResult?.previous

package/src/services/nostr-signer.js

@@ -71,10 +71,13 @@ export default class NostrSigner {
     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]))
+      keys.forEach(k => r[k].push(v[1].trim().replace(/\/$/, '')))
       return r
     }, { read: [], write: [] })
-    Object.values(relays).forEach(v => { v.length === 0 && v.push(...freeRelays) })
+    for (const k in relays) {
+      if (relays[k].length === 0) relays[k].push(...freeRelays)
+      relays[k] = [...new Set(relays[k])]
+    }
     return (this.relays = relays)
   }
 
@@ -91,7 +94,7 @@ export default class NostrSigner {
       content: '',
       created_at: Math.floor(Date.now() / 1000)
     })
-    await nostrRelays.sendEvent(relayList, [...new Set([...seedRelays, ...this.relays.write])])
+    await nostrRelays.sendEvent(relayList, [...new Set([...seedRelays, ...this.relays.write].map(r => r.trim().replace(/\/$/, '')))])
     return this.relays
   }