nappup 1.0.12 → 1.0.14

package/package.json

@@ -6,7 +6,7 @@
     "url": "git+https://github.com/44billion/nappup.git"
   },
   "license": "GPL-3.0-or-later",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Nostr App Uploader",
   "type": "module",
   "scripts": {

package/src/index.js

@@ -262,7 +262,9 @@ async function maybeUploadStall ({
 
   const publishStall = async (event) => {
     const signedEvent = await signer.signEvent(event)
-    return await throttledSendEvent(signedEvent, writeRelays, { pause, log, trailingPause: true })
+    // App stores are fetching stall events just from primal relay for now
+    const relays = [...new Set([...writeRelays, 'wss://relay.primal.net'])]
+    return await throttledSendEvent(signedEvent, relays, { pause, log, trailingPause: true })
   }
 
   const createdAt = Math.floor(Date.now() / 1000)

package/src/services/nostr-relays.js

@@ -64,17 +64,14 @@ export class NostrRelays {
   // Get events from a list of relays
   async getEvents (filter, relays, timeout = 5000) {
     const events = []
-    const resolveOrReject = (resolve, reject, err) => {
-      err ? reject(err) : resolve()
-    }
     const promises = relays.map(async (url) => {
       let sub
       let isClosed = false
       const p = Promise.withResolvers()
       const timer = maybeUnref(setTimeout(() => {
-        sub?.close()
         isClosed = true
-        resolveOrReject(p.resolve, p.reject, new Error(`timeout: ${url}`))
+        sub?.close()
+        p.reject(new Error(`timeout: ${url}`))
       }, timeout))
       try {
         const relay = await this.#getRelay(url)
@@ -85,7 +82,8 @@ export class NostrRelays {
           onclose: err => {
             clearTimeout(timer)
             if (isClosed) return
-            resolveOrReject(p.resolve, p.reject, err /* may be empty (closed normally) */)
+            // may have closed normally, without error
+            err ? p.reject(err) : p.resolve()
           },
           oneose: () => {
             clearTimeout(timer)
@@ -94,12 +92,12 @@ export class NostrRelays {
             p.resolve()
           }
         })
-
-        await p.promise
       } catch (err) {
         clearTimeout(timer)
         p.reject(err)
       }
+
+      return p.promise
     })
 
     const results = await Promise.allSettled(promises)
@@ -116,22 +114,26 @@ export class NostrRelays {
   async sendEvent (event, relays, timeout = 3000) {
     const promises = relays.map(async (url) => {
       let timer
+      const p = Promise.withResolvers()
       try {
         timer = maybeUnref(setTimeout(() => {
-          throw new Error(`timeout: ${url}`)
+          p.reject(new Error(`timeout: ${url}`))
         }, timeout))
+
         const relay = await this.#getRelay(url)
         await relay.publish(event)
+        p.resolve()
       } catch (err) {
-        if (err.message?.startsWith('duplicate:')) return
+        if (err.message?.startsWith('duplicate:')) return p.resolve()
         if (err.message?.startsWith('mute:')) {
           console.info(`${url} - ${err.message}`)
-          return
+          return p.resolve()
         }
-        throw err
+        p.reject(err)
       } finally {
         clearTimeout(timer)
       }
+      return p.promise
     })
 
     const results = await Promise.allSettled(promises)