nappup 1.5.5 → 1.5.7

package/package.json

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

package/src/helpers/app-metadata.js

@@ -9,6 +9,20 @@ export function extractHtmlMetadata (htmlContent) {
       name = titleMatch[1].trim()
     }
 
+    if (!name) {
+      const ogTitleRegex = /<meta\s+[^>]*(?:property|name)\s*=\s*["']og:title["'][^>]*content\s*=\s*["']([^"']+)["'][^>]*>/i
+      const ogTitleMatch = htmlContent.match(ogTitleRegex)
+      if (ogTitleMatch && ogTitleMatch[1]) {
+        name = ogTitleMatch[1].trim()
+      } else {
+        const altOgTitleRegex = /<meta\s+[^>]*content\s*=\s*["']([^"']+)["'][^>]*(?:property|name)\s*=\s*["']og:title["'][^>]*>/i
+        const altOgTitleMatch = htmlContent.match(altOgTitleRegex)
+        if (altOgTitleMatch && altOgTitleMatch[1]) {
+          name = altOgTitleMatch[1].trim()
+        }
+      }
+    }
+
     const metaDescRegex = /<meta\s+[^>]*name\s*=\s*["']description["'][^>]*content\s*=\s*["']([^"']+)["'][^>]*>/i
     const metaDescMatch = htmlContent.match(metaDescRegex)
     if (metaDescMatch && metaDescMatch[1]) {
@@ -22,6 +36,20 @@ export function extractHtmlMetadata (htmlContent) {
         description = altMetaDescMatch[1].trim()
       }
     }
+
+    if (!description) {
+      const ogDescRegex = /<meta\s+[^>]*(?:property|name)\s*=\s*["']og:description["'][^>]*content\s*=\s*["']([^"']+)["'][^>]*>/i
+      const ogDescMatch = htmlContent.match(ogDescRegex)
+      if (ogDescMatch && ogDescMatch[1]) {
+        description = ogDescMatch[1].trim()
+      } else {
+        const altOgDescRegex = /<meta\s+[^>]*content\s*=\s*["']([^"']+)["'][^>]*(?:property|name)\s*=\s*["']og:description["'][^>]*>/i
+        const altOgDescMatch = htmlContent.match(altOgDescRegex)
+        if (altOgDescMatch && altOgDescMatch[1]) {
+          description = altOgDescMatch[1].trim()
+        }
+      }
+    }
   } catch (_) {
     // ignore
   }

package/src/index.js

@@ -182,6 +182,12 @@ async function uploadBinaryDataChunks ({ nmmr, signer, filename, chunkLength, lo
       ;({ pause } = (await throttledSendEvent(foundEvent, missingRelays, { pause, log, trailingPause: true, minSuccessfulRelays: 0 })))
       continue
     }
+
+    const createdAt = Math.floor(Date.now() / 1000)
+    let effectiveCreatedAt = (foundEvent && foundEvent.created_at >= createdAt) ? foundEvent.created_at + 1 : createdAt
+    const maxCreatedAt = createdAt + 172800 // 2 days ahead
+    if (effectiveCreatedAt > maxCreatedAt) effectiveCreatedAt = maxCreatedAt
+
     const binaryDataChunk = {
       kind: 34600,
       tags: [
@@ -192,7 +198,7 @@ async function uploadBinaryDataChunks ({ nmmr, signer, filename, chunkLength, lo
       ],
       // These chunks already have the expected size of 51000 bytes
       content: new Base93Encoder().update(chunk.contentBytes).getEncoded(),
-      created_at: Math.floor(Date.now() / 1000)
+      created_at: effectiveCreatedAt
     }
 
     const event = await signer.signEvent(binaryDataChunk)
@@ -218,23 +224,38 @@ async function throttledSendEvent (event, relays, {
     return { pause }
   }
 
-  const [rateLimitErrors, unretryableErrors] =
+  const [rateLimitErrors, maybeUnretryableErrors, unretryableErrors] =
     errors.reduce((r, v) => {
-      if ((v.reason?.message ?? '').startsWith('rate-limited:')) r[0].push(v)
-      else r[1].push(v)
+      const message = v.reason?.message ?? ''
+      if (message.startsWith('rate-limited:')) r[0].push(v)
+      // https://github.com/nbd-wtf/nostr-tools/blob/28f7553187d201088c8a1009365db4ecbe03e568/abstract-relay.ts#L311
+      else if (message === 'publish timed out') r[1].push(v)
+      else r[2].push(v)
       return r
-    }, [[], []])
+    }, [[], [], []])
+
+  // One-time special retry
+  if (maybeUnretryableErrors.length > 0) {
+    const timedOutRelays = maybeUnretryableErrors.map(v => v.relay)
+    log(`${maybeUnretryableErrors.length} timeout errors, retrying once after ${pause}ms:\n${maybeUnretryableErrors.map(v => `${v.relay}: ${v.reason.message}`).join('; ')}`)
+    if (pause) await new Promise(resolve => setTimeout(resolve, pause))
+    const { errors: timeoutRetryErrors } = await nostrRelays.sendEvent(event, timedOutRelays, 15000)
+    unretryableErrors.push(...timeoutRetryErrors)
+  }
+
   if (unretryableErrors.length > 0) {
     log(`${unretryableErrors.length} unretryable errors:\n${unretryableErrors.map(v => `${v.relay}: ${v.reason.message}`).join('; ')}`)
     console.log('Erroed event:', stringifyEvent(event))
   }
-  const unretryableErrorsLength = errors.length - rateLimitErrors.length
-  const maybeSuccessfulRelays = relays.length - unretryableErrorsLength
+  const maybeSuccessfulRelays = relays.length - unretryableErrors.length
   const hasReachedMaxRetries = retries > maxRetries
   if (
     hasReachedMaxRetries ||
     maybeSuccessfulRelays < minSuccessfulRelays
-  ) throw new Error(errors.map(v => `\n${v.relay}: ${v.reason}`).join('\n'))
+  ) {
+    const finalErrors = [...rateLimitErrors, ...unretryableErrors]
+    throw new Error(finalErrors.map(v => `\n${v.relay}: ${v.reason}`).join('\n'))
+  }
 
   if (rateLimitErrors.length === 0) {
     if (pause && trailingPause) await new Promise(resolve => setTimeout(resolve, pause))
@@ -245,7 +266,8 @@ async function throttledSendEvent (event, relays, {
   log(`Rate limited by ${erroedRelays.length} relays, pausing for ${pause + 2000} ms`)
   await new Promise(resolve => setTimeout(resolve, (pause += 2000)))
 
-  minSuccessfulRelays = Math.max(0, minSuccessfulRelays - (relays.length - erroedRelays.length))
+  // Subtracts the successful publishes from the original minSuccessfulRelays goal
+  minSuccessfulRelays = Math.max(0, minSuccessfulRelays - (relays.length - erroedRelays.length - unretryableErrors.length))
   return await throttledSendEvent(event, erroedRelays, {
     pause, log, retries: ++retries, maxRetries, minSuccessfulRelays, leadingPause: false, trailingPause
   })
@@ -313,59 +335,65 @@ async function uploadBundle ({ dTag, channel, fileMetadata, signer, pause = 0, s
 
   const writeRelays = [...new Set([...(await signer.getRelays()).write, ...nappRelays])]
 
-  if (!shouldReupload) {
-    const events = (await nostrRelays.getEvents({
-      kinds: [kind],
-      authors: [await signer.getPublicKey()],
-      '#d': [dTag],
-      limit: 1
-    }, writeRelays)).result
-
-    if (events.length > 0) {
-      events.sort((a, b) => {
-        if (b.created_at !== a.created_at) return b.created_at - a.created_at
-        if (a.id < b.id) return -1
-        if (a.id > b.id) return 1
-        return 0
-      })
+  let mostRecentEvent
+  const events = (await nostrRelays.getEvents({
+    kinds: [kind],
+    authors: [await signer.getPublicKey()],
+    '#d': [dTag],
+    limit: 1
+  }, writeRelays)).result
+
+  if (events.length > 0) {
+    events.sort((a, b) => {
+      if (b.created_at !== a.created_at) return b.created_at - a.created_at
+      if (a.id < b.id) return -1
+      if (a.id > b.id) return 1
+      return 0
+    })
+    mostRecentEvent = events[0]
+  }
 
-      const mostRecentEvent = events[0]
-      const recentFileTags = mostRecentEvent.tags
-        .filter(t => t[0] === 'file' && t[2] !== '.well-known/napp.json')
-        .sort((a, b) => (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : 0))
+  if (!shouldReupload && mostRecentEvent) {
+    const recentFileTags = mostRecentEvent.tags
+      .filter(t => t[0] === 'file' && t[2] !== '.well-known/napp.json')
+      .sort((a, b) => (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : 0))
 
-      const currentFileTags = fileTags
-        .filter(t => t[2] !== '.well-known/napp.json')
-        .sort((a, b) => (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : 0))
+    const currentFileTags = fileTags
+      .filter(t => t[2] !== '.well-known/napp.json')
+      .sort((a, b) => (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : 0))
 
-      const isSame = currentFileTags.length === recentFileTags.length && currentFileTags.every((t, i) => {
-        const rt = recentFileTags[i]
-        return rt.length >= 4 && rt[1] === t[1] && rt[2] === t[2] && rt[3] === t[3]
-      })
+    const isSame = currentFileTags.length === recentFileTags.length && currentFileTags.every((t, i) => {
+      const rt = recentFileTags[i]
+      return rt.length >= 4 && rt[1] === t[1] && rt[2] === t[2] && rt[3] === t[3]
+    })
 
-      if (isSame) {
-        log(`Bundle based on ${fileTags.length} files is up-to-date (id: ${mostRecentEvent.id} - created_at: ${new Date(mostRecentEvent.created_at * 1000).toISOString()})`)
+    if (isSame) {
+      log(`Bundle based on ${fileTags.length} files is up-to-date (id: ${mostRecentEvent.id} - created_at: ${new Date(mostRecentEvent.created_at * 1000).toISOString()})`)
 
-        const matchingEvents = events.filter(e => e.id === mostRecentEvent.id)
-        const coveredRelays = new Set(matchingEvents.map(e => e.meta?.relay).filter(Boolean))
-        const missingRelays = writeRelays.filter(r => !coveredRelays.has(r))
+      const matchingEvents = events.filter(e => e.id === mostRecentEvent.id)
+      const coveredRelays = new Set(matchingEvents.map(e => e.meta?.relay).filter(Boolean))
+      const missingRelays = writeRelays.filter(r => !coveredRelays.has(r))
 
-        if (missingRelays.length === 0) return mostRecentEvent
+      if (missingRelays.length === 0) return mostRecentEvent
 
-        // nostrRelays.getEvents currently doesn't tell us which event came from which relay,
-        // so we re-upload to all relays to ensure consistency
-        log(`Re-uploading existing bundle event to ${missingRelays.length} missing relays (out of ${writeRelays.length})`)
-        await throttledSendEvent(mostRecentEvent, missingRelays, { pause, trailingPause: true, log, minSuccessfulRelays: 0 })
-        return mostRecentEvent
-      }
+      // nostrRelays.getEvents currently doesn't tell us which event came from which relay,
+      // so we re-upload to all relays to ensure consistency
+      log(`Re-uploading existing bundle event to ${missingRelays.length} missing relays (out of ${writeRelays.length})`)
+      await throttledSendEvent(mostRecentEvent, missingRelays, { pause, trailingPause: true, log, minSuccessfulRelays: 0 })
+      return mostRecentEvent
     }
   }
 
+  const createdAt = Math.floor(Date.now() / 1000)
+  let effectiveCreatedAt = (mostRecentEvent && mostRecentEvent.created_at >= createdAt) ? mostRecentEvent.created_at + 1 : createdAt
+  const maxCreatedAt = createdAt + 172800 // 2 days ahead
+  if (effectiveCreatedAt > maxCreatedAt) effectiveCreatedAt = maxCreatedAt
+
   const appBundle = {
     kind,
     tags,
     content: '',
-    created_at: Math.floor(Date.now() / 1000)
+    created_at: effectiveCreatedAt
   }
   const event = await signer.signEvent(appBundle)
   await throttledSendEvent(event, writeRelays, { pause, trailingPause: true, log })
@@ -404,7 +432,10 @@ async function maybeUploadStall ({
 
   const previousResult = await getPreviousStall(dTag, relays, signer, channel)
   const previous = previousResult?.previous
-  if (!previous && !hasMetadata) return { pause }
+  if (!previous && !hasMetadata) {
+    if (shouldReupload) log('Skipping stall event upload: No previous event found and no metadata provided.')
+    return { pause }
+  }
 
   const publishStall = async (event) => {
     const signedEvent = await signer.signEvent(event)
@@ -479,7 +510,10 @@ async function maybeUploadStall ({
       if (isSummaryAuto) tags.push(['auto', 'summary'])
     }
 
-    if (!hasIcon || !hasName) return { pause }
+    if (!hasIcon || !hasName) {
+      log(`Skipping stall event creation: Missing required metadata.${!hasName ? ' Name is missing.' : ''}${!hasIcon ? ' Icon is missing.' : ''}`)
+      return { pause }
+    }
 
     return await publishStall({
       kind,
@@ -646,11 +680,15 @@ async function maybeUploadStall ({
     return await throttledSendEvent(previous, missingRelays, { pause, log, trailingPause: true, minSuccessfulRelays: 0 })
   }
 
+  let effectiveCreatedAt = (previous && previous.created_at >= createdAt) ? previous.created_at + 1 : createdAt
+  const maxCreatedAt = createdAt + 172800 // 2 days ahead
+  if (effectiveCreatedAt > maxCreatedAt) effectiveCreatedAt = maxCreatedAt
+
   return await publishStall({
     kind,
     tags,
     content: typeof previous.content === 'string' ? previous.content : '',
-    created_at: createdAt
+    created_at: effectiveCreatedAt
   })
 }