nappup 1.5.6 → 1.5.8

package/package.json

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

@@ -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
@@ -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)
@@ -268,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()],
@@ -327,61 +333,67 @@ async function uploadBundle ({ dTag, channel, fileMetadata, signer, pause = 0, s
     ...fileTags
   ]
 
-  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
-      })
+  const writeRelays = [...new Set([...(await signer.getRelays()).write, ...nappRelays].map(r => r.trim().replace(/\/$/, '')))]
 
-      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))
+  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 currentFileTags = fileTags
-        .filter(t => 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 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 currentFileTags = fileTags
+      .filter(t => t[2] !== '.well-known/napp.json')
+      .sort((a, b) => (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : 0))
 
-      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 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 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 (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 (missingRelays.length === 0) return mostRecentEvent
+      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))
 
-        // 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
-      }
+      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
     }
   }
 
+  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 })
@@ -416,11 +428,14 @@ 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
-  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)
@@ -495,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,
@@ -662,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
   })
 }
 

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
   }