nappup 2.3.5 → 2.3.7

package/README.md

@@ -137,7 +137,7 @@ await publishApp(fileList, signer, {
 
 - **`fileList`** — a `FileList` or array of `File` objects (each needs `webkitRelativePath`).
 - **`signer`** — a [NIP-07](https://github.com/nostr-protocol/nips/blob/master/07.md)-compatible signer. In the browser, `window.nostr` is used automatically if omitted.
-- **`onEvent`** — optional callback that receives progress events with a `type` (`'init'`, `'file-uploaded'`, `'complete'`, `'error'`, …) and `progress` (0–100).
+- **`onEvent`** — optional callback that receives progress events with a `type` (`'services-checking'`, `'init'`, `'file-uploaded'`, `'complete'`, `'error'`, …) and `progress` (0–100).
 
 Rejected uploads use `NappupError`, with a stable code from
 `NAPPUP_ERROR_CODES`. The original error is retained as `cause`, and some

package/package.json

@@ -6,7 +6,7 @@
     "url": "git+https://github.com/44billion/nappup.git"
   },
   "license": "MIT",
-  "version": "2.3.5",
+  "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)
 }

package/src/index.js

@@ -43,6 +43,7 @@ export default async function (fileList, nostrSigner, opts = {}) {
  * Every event has `type` (string) and `progress` (0–100 integer).
  *
  * Event types:
+ *   'services-checking'  — Blossom preferences and server health are being checked
  *   'init'               — { totalFiles, totalSteps, dTag, relayCount, blossomCount }
  *   'media-uploaded'     — { mediaType: 'icon'|'key_art'|'screenshot', service: 'blossom'|'irfs'|null }
  *   'file-uploaded'      — { filename, service: 'blossom'|'irfs' }
@@ -182,6 +183,7 @@ async function publishApp (fileList, nostrSigner, {
   let isExplicitIcon = false
   let pause = 1000
 
+  emit({ type: 'services-checking' })
   log('Checking for blossom servers...')
   let blossomServerUrls = []
   try {

package/src/services/blossom-upload.js

@@ -3,6 +3,27 @@ import nostrRelays from '#services/nostr-relays.js'
 import { bytesToBase16 } from '#helpers/base16.js'
 import { normalizeBlossomServerUrl } from 'libp2r2p/url'
 
+const DEFAULT_HEALTH_CHECK_TIMEOUT_MS = 5000
+const DEFAULT_EXISTENCE_CHECK_TIMEOUT_MS = 5000
+
+// Bounds browser fetches whose native network timeout can take minutes.
+async function fetchWithTimeout (url, options, timeoutMs) {
+  const controller = new AbortController()
+  let timedOut = false
+  const timeoutId = setTimeout(() => {
+    timedOut = true
+    controller.abort()
+  }, timeoutMs)
+  try {
+    return await fetch(url, { ...options, signal: controller.signal })
+  } catch (error) {
+    if (timedOut) throw new Error(`request timed out after ${timeoutMs}ms`)
+    throw error
+  } finally {
+    clearTimeout(timeoutId)
+  }
+}
+
 async function createAuthHeader (signer, modify) {
   const now = Math.floor(Date.now() / 1000)
   const event = {
@@ -43,13 +64,16 @@ export async function getBlossomServers (signer, writeRelays) {
 /**
  * Health-checks blossom servers with a simple HEAD request.
  * A server is considered healthy if fetch resolves (any HTTP status).
- * Only network-level errors mark a server as unreachable.
+ * Network errors and timeouts mark a server as unreachable.
  */
-export async function healthCheckServers (servers, signer, { log = () => {} } = {}) {
+export async function healthCheckServers (servers, signer, {
+  log = () => {},
+  timeoutMs = DEFAULT_HEALTH_CHECK_TIMEOUT_MS
+} = {}) {
   const results = await Promise.allSettled(
     servers.map(async (serverUrl) => {
       const normalized = normalizeBlossomServerUrl(serverUrl)
-      await fetch(normalized, { method: 'HEAD' })
+      await fetchWithTimeout(normalized, { method: 'HEAD', mode: 'no-cors' }, timeoutMs)
       return normalized
     })
   )
@@ -86,9 +110,17 @@ export async function computeFileHash (file) {
 async function uploadFileToServer (serverUrl, signer, file, fileHash, mimeType, { shouldReupload, log, maxRetries = 5 }) {
   // Check if already uploaded
   if (!shouldReupload) {
-    const checkResponse = await fetch(`${serverUrl}/${fileHash}`, { method: 'HEAD' })
-    if (checkResponse.ok) {
-      return { success: true, alreadyExists: true }
+    try {
+      const checkResponse = await fetchWithTimeout(
+        `${serverUrl}/${fileHash}`,
+        { method: 'HEAD' },
+        DEFAULT_EXISTENCE_CHECK_TIMEOUT_MS
+      )
+      if (checkResponse.ok) {
+        return { success: true, alreadyExists: true }
+      }
+    } catch (error) {
+      log(`Could not check whether ${fileHash} exists on ${serverUrl}; uploading it anyway: ${error?.message ?? error}`)
     }
   }
 
@@ -184,7 +216,8 @@ export async function uploadFilesToBlossom ({
     }
   })
 
-  await Promise.allSettled(serverTasks)
+  // Unexpected task errors indicate a programming failure and must reach the caller.
+  await Promise.all(serverTasks)
 
   const uploadedFiles = []
   const failedFiles = []