nappup 2.3.6 → 2.3.8

package/package.json

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

@@ -12,6 +12,8 @@ export const NAPPUP_ERROR_CODES = Object.freeze({
   BLOSSOM_UPLOAD_FAILED: 'NAPPUP_BLOSSOM_UPLOAD_FAILED',
   IRFS_UPLOAD_FAILED: 'NAPPUP_IRFS_UPLOAD_FAILED',
   MANIFEST_UPLOAD_FAILED: 'NAPPUP_MANIFEST_UPLOAD_FAILED',
+  SIGNER_LOCKED: 'NAPPUP_SIGNER_LOCKED',
+  SIGNER_DENIED: 'NAPPUP_SIGNER_DENIED',
   UPLOAD_FAILED: 'NAPPUP_UPLOAD_FAILED'
 })
 
@@ -60,9 +62,51 @@ export class NappupError extends Error {
   }
 }
 
+const SIGNER_LOCKED_PATTERNS = [
+  /^VAULT_LOCKED$/,
+  /vault (?:is )?locked/i,
+  /account (?:is )?locked/i,
+  /wallet (?:is )?locked/i
+]
+
+const SIGNER_DENIED_PATTERNS = [
+  /permission denied/i,
+  /user (?:rejected|denied)/i,
+  /sign(?:ing)? request (?:rejected|denied)/i
+]
+
+// Walks the cause chain looking for signer-level failures such as a locked
+// vault or a rejected signing prompt. Returns a NAPPUP_* code or null.
+export function classifySignerError (error) {
+  let current = error
+  for (let depth = 0; current && depth < 6; depth++) {
+    if (current.name === 'NotAllowedError' || current.code === 'DENIED_BY_USER') {
+      return NAPPUP_ERROR_CODES.SIGNER_DENIED
+    }
+    const message = typeof current.message === 'string' ? current.message : ''
+    if (SIGNER_LOCKED_PATTERNS.some(pattern => pattern.test(message))) {
+      return NAPPUP_ERROR_CODES.SIGNER_LOCKED
+    }
+    if (SIGNER_DENIED_PATTERNS.some(pattern => pattern.test(message))) {
+      return NAPPUP_ERROR_CODES.SIGNER_DENIED
+    }
+    current = current.cause
+  }
+  return null
+}
+
 // Ensures every error crossing nappup's public API has a documented code.
 export function normalizeNappupError (error) {
-  if (typeof error?.code === 'string' && error.code.startsWith('NAPPUP_')) return error
+  if (typeof error?.code === 'string' && error.code.startsWith('NAPPUP_')) {
+    const signerCode = classifySignerError(error)
+    if (signerCode && signerCode !== error.code) {
+      return new NappupError(signerCode, error.message, {
+        cause: error.cause,
+        details: error.details
+      })
+    }
+    return error
+  }
   if (error?.name === 'AbortError' || error?.code === 'ABORT_ERR') {
     return new NappupError(
       NAPPUP_ERROR_CODES.UPLOAD_CANCELLED,
@@ -71,7 +115,7 @@ export function normalizeNappupError (error) {
     )
   }
   return new NappupError(
-    NAPPUP_ERROR_CODES.UPLOAD_FAILED,
+    classifySignerError(error) ?? NAPPUP_ERROR_CODES.UPLOAD_FAILED,
     error?.message || 'Upload failed',
     { cause: error }
   )

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

@@ -8,7 +8,7 @@ import { extractHtmlMetadata, findAppIcon, findIndexFile } from '#helpers/app-me
 import { getBlossomServers, healthCheckServers, uploadFilesToBlossom } from '#services/blossom-upload.js'
 import { uploadBinaryDataChunks } from '#services/irfs-upload.js'
 import { uploadSiteManifest } from '#services/site-manifest.js'
-import { NappupError, NAPPUP_ERROR_CODES, normalizeNappupError } from '#errors.js'
+import { NappupError, NAPPUP_ERROR_CODES, normalizeNappupError, classifySignerError } from '#errors.js'
 
 export { NappupError, NAPPUP_ERROR_CODES } from '#errors.js'
 
@@ -301,15 +301,18 @@ async function publishApp (fileList, nostrSigner, {
       log
     })
     if (failedFiles.length) {
+      const signerError = failedFiles
+        .flatMap(failed => failed.errors ?? [])
+        .map(failed => failed.error)
+        .find(error => classifySignerError(error))
+      const details = {
+        failedFileCount: failedFiles.length,
+        filenames: failedFiles.map(failed => failed.filename).filter(Boolean)
+      }
       throw new NappupError(
         NAPPUP_ERROR_CODES.BLOSSOM_UPLOAD_FAILED,
         `${failedFiles.length} file(s) failed to upload to Blossom`,
-        {
-          details: {
-            failedFileCount: failedFiles.length,
-            filenames: failedFiles.map(failed => failed.filename).filter(Boolean)
-          }
-        }
+        signerError ? { cause: signerError, details } : { details }
       )
     }
 

package/src/services/blossom-upload.js

@@ -2,6 +2,7 @@ import { sha256 } from '@noble/hashes/sha2.js'
 import nostrRelays from '#services/nostr-relays.js'
 import { bytesToBase16 } from '#helpers/base16.js'
 import { normalizeBlossomServerUrl } from 'libp2r2p/url'
+import { classifySignerError } from '#errors.js'
 
 const DEFAULT_HEALTH_CHECK_TIMEOUT_MS = 5000
 const DEFAULT_EXISTENCE_CHECK_TIMEOUT_MS = 5000
@@ -149,6 +150,12 @@ async function uploadFileToServer (serverUrl, signer, file, fileHash, mimeType,
       const descriptor = await response.json()
       return { success: true, descriptor }
     } catch (err) {
+      if (classifySignerError(err)) {
+        // Signer-level failures (locked vault, rejected prompt) are not
+        // transient upload errors: retrying would just re-prompt or fail
+        // again, so surface them immediately.
+        return { success: false, error: err }
+      }
       if (attempt === maxRetries) {
         return { success: false, error: err }
       }