nappup 1.5.3 → 1.5.5

package/package.json

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

package/src/helpers/event.js

@@ -0,0 +1,26 @@
+export function stringifyEvent (event) {
+  event = { ...event }
+
+  if (typeof event.content === 'string' && event.content.length > 70) {
+    event.content = `${event.content.slice(0, 70)}...(${event.content.length})`
+  }
+
+  if (typeof event.sig === 'string' && event.sig.length > 3) {
+    event.sig = `${event.sig.slice(0, 3)}...(${event.sig.length})`
+  }
+
+  if (Array.isArray(event.tags)) {
+    const totalTagsCount = event.tags.length
+    event.tags = event.tags.slice(0, 5).map(tag =>
+      Array.isArray(tag)
+        ? tag.map(val => typeof val === 'string' && val.length > 64 ? `${val.slice(0, 64)}...(${val.length})` : val)
+        : tag
+    )
+
+    if (totalTagsCount > 5) {
+      event.tags.push(`... and ${totalTagsCount - 5} more tags`)
+    }
+  }
+
+  return JSON.stringify(event, null, 2)
+}

package/src/index.js

@@ -6,6 +6,7 @@ import NostrSigner from '#services/nostr-signer.js'
 import { streamToChunks, streamToText } from '#helpers/stream.js'
 import { isNostrAppDTagSafe, deriveNostrAppDTag } from '#helpers/app.js'
 import { extractHtmlMetadata, findFavicon, findIndexFile } from '#helpers/app-metadata.js'
+import { stringifyEvent } from '#helpers/event.js'
 import { NAPP_CATEGORIES } from '#config/napp-categories.js'
 
 export default async function (...args) {
@@ -129,7 +130,7 @@ export async function toApp (fileList, nostrSigner, { log = () => {}, dTag, dTag
     }
   }
 
-  log(`Uploading stall event for #${dTag}`)
+  log(`Uploading stall event for ${dTag}`)
   ;({ pause } = (await maybeUploadStall({
     dTag,
     channel,
@@ -145,6 +146,7 @@ export async function toApp (fileList, nostrSigner, { log = () => {}, dTag, dTag
     writeRelays,
     log,
     pause,
+    shouldReupload,
     self: nappJson.self?.[0]?.[0],
     countries: nappJson.country,
     categories: nappJson.category,
@@ -177,7 +179,7 @@ async function uploadBinaryDataChunks ({ nmmr, signer, filename, chunkLength, lo
         continue
       }
       log(`${filename}: Re-uploading chunk ${++chunkIndex} of ${chunkLength} to ${missingRelays.length} missing relays (out of ${relays.length})`)
-      ;({ pause } = (await throttledSendEvent(foundEvent, missingRelays, { pause, log, trailingPause: true })))
+      ;({ pause } = (await throttledSendEvent(foundEvent, missingRelays, { pause, log, trailingPause: true, minSuccessfulRelays: 0 })))
       continue
     }
     const binaryDataChunk = {
@@ -222,7 +224,10 @@ async function throttledSendEvent (event, relays, {
       else r[1].push(v)
       return r
     }, [[], []])
-  log(`${unretryableErrors.length} Unretryable errors\n: ${unretryableErrors.map(v => `${v.relay}: ${v.reason.message}`).join('; ')}`)
+  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 hasReachedMaxRetries = retries > maxRetries
@@ -325,9 +330,15 @@ async function uploadBundle ({ dTag, channel, fileMetadata, signer, pause = 0, s
       })
 
       const mostRecentEvent = events[0]
-      const recentFileTags = mostRecentEvent.tags.filter(t => t[0] === 'file')
+      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 isSame = fileTags.length === recentFileTags.length && fileTags.every((t, i) => {
+      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]
       })
@@ -344,7 +355,7 @@ async function uploadBundle ({ dTag, channel, fileMetadata, signer, pause = 0, s
         // 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 })
+        await throttledSendEvent(mostRecentEvent, missingRelays, { pause, trailingPause: true, log, minSuccessfulRelays: 0 })
         return mostRecentEvent
       }
     }
@@ -376,6 +387,7 @@ async function maybeUploadStall ({
   writeRelays,
   log,
   pause,
+  shouldReupload,
   self,
   countries,
   categories,
@@ -621,7 +633,7 @@ async function maybeUploadStall ({
     }
   }
 
-  if (!changed) {
+  if (!changed && !shouldReupload) {
     const { storedEvents } = previousResult
 
     const matchingEvents = storedEvents.filter(e => e.id === previous.id)
@@ -631,7 +643,7 @@ async function maybeUploadStall ({
     if (missingRelays.length === 0) return { pause }
 
     log(`Re-uploading existing stall event to ${missingRelays.length} missing relays (out of ${relays.length})`)
-    return await throttledSendEvent(previous, missingRelays, { pause, log, trailingPause: true })
+    return await throttledSendEvent(previous, missingRelays, { pause, log, trailingPause: true, minSuccessfulRelays: 0 })
   }
 
   return await publishStall({