nappup 1.4.2 → 1.5.2

package/package.json

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

package/src/index.js

@@ -1,7 +1,7 @@
 import NMMR from 'nmmr'
 import { appEncode } from '#helpers/nip19.js'
 import Base93Encoder from '#services/base93-encoder.js'
-import nostrRelays from '#services/nostr-relays.js'
+import nostrRelays, { nappRelays } from '#services/nostr-relays.js'
 import NostrSigner from '#services/nostr-signer.js'
 import { streamToChunks, streamToText } from '#helpers/stream.js'
 import { isNostrAppDTagSafe, deriveNostrAppDTag } from '#helpers/app.js'
@@ -151,8 +151,8 @@ export async function toApp (fileList, nostrSigner, { log = () => {}, dTag, dTag
     hashtags: nappJson.hashtag
   })))
 
-  log(`Uploading bundle #${dTag}`)
-  const bundle = await uploadBundle({ dTag, channel, fileMetadata, signer: nostrSigner, pause })
+  log(`Uploading bundle ${dTag}`)
+  const bundle = await uploadBundle({ dTag, channel, fileMetadata, signer: nostrSigner, pause, shouldReupload, log })
 
   const appEntity = appEncode({
     dTag: bundle.tags.find(v => v[0] === 'd')[1],
@@ -188,8 +188,10 @@ async function uploadBinaryDataChunks ({ nmmr, signer, filename, chunkLength, lo
     }
 
     const event = await signer.signEvent(binaryDataChunk)
-    log(`${filename}: Uploading file part ${++chunkIndex} of ${chunkLength} to ${writeRelays.length} relays`)
-    ;({ pause } = (await throttledSendEvent(event, writeRelays, { pause, log, trailingPause: true })))
+    const relays = [...new Set([...writeRelays, ...nappRelays])]
+    const fallbackRelayCount = relays.length - writeRelays.length
+    log(`${filename}: Uploading file part ${++chunkIndex} of ${chunkLength} to ${writeRelays.length} relays${fallbackRelayCount > 0 ? ` (+${fallbackRelayCount} fallback)` : ''}`)
+    ;({ pause } = (await throttledSendEvent(event, relays, { pause, log, trailingPause: true })))
   }
   return { pause }
 }
@@ -245,7 +247,7 @@ async function getPreviousCtags (dTagValue, currentCtagValue, writeRelays, signe
     authors: [await signer.getPublicKey()],
     '#d': [dTagValue],
     limit: 1
-  }, writeRelays)).result
+  }, [...new Set([...writeRelays, ...nappRelays])])).result
 
   let hasCurrentCtag = false
   const hasEvent = storedEvents.length > 0
@@ -278,23 +280,65 @@ async function getPreviousCtags (dTagValue, currentCtagValue, writeRelays, signe
   return { otherCtags, hasEvent, hasCurrentCtag }
 }
 
-async function uploadBundle ({ dTag, channel, fileMetadata, signer, pause = 0 }) {
+async function uploadBundle ({ dTag, channel, fileMetadata, signer, pause = 0, shouldReupload = false, log = () => {} }) {
   const kind = {
     main: 37448, // stable
     next: 37449, // insider
     draft: 37450 // vibe coded preview
   }[channel] ?? 37448
+
+  const fileTags = fileMetadata.map(v => ['file', v.rootHash, v.filename, v.mimeType])
+  const tags = [
+    ['d', dTag],
+    ...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]
+    }, 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 mostRecentEvent = events[0]
+      const recentFileTags = mostRecentEvent.tags.filter(t => t[0] === 'file')
+
+      const isSame = fileTags.length === recentFileTags.length && fileTags.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 (events.length === writeRelays.length && events.every(e => e.id === mostRecentEvent.id)) 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 all ${writeRelays.length} relays`)
+        await throttledSendEvent(mostRecentEvent, writeRelays, { pause, trailingPause: true, log })
+        return mostRecentEvent
+      }
+    }
+  }
+
   const appBundle = {
     kind,
-    tags: [
-      ['d', dTag],
-      ...fileMetadata.map(v => ['file', v.rootHash, v.filename, v.mimeType])
-    ],
+    tags,
     content: '',
     created_at: Math.floor(Date.now() / 1000)
   }
   const event = await signer.signEvent(appBundle)
-  await throttledSendEvent(event, (await signer.getRelays()).write, { pause, trailingPause: true })
+  await throttledSendEvent(event, writeRelays, { pause, trailingPause: true, log })
   return event
 }
 
@@ -330,8 +374,7 @@ async function maybeUploadStall ({
 
   const publishStall = async (event) => {
     const signedEvent = await signer.signEvent(event)
-    // App stores are fetching stall events just from 44b relay for now
-    const relays = [...new Set([...writeRelays, 'wss://relay.44billion.net'])]
+    const relays = [...new Set([...writeRelays, ...nappRelays])]
     return await throttledSendEvent(signedEvent, relays, { pause, log, trailingPause: true })
   }
 
@@ -579,7 +622,7 @@ async function getPreviousStall (dTagValue, writeRelays, signer, channel) {
     authors: [await signer.getPublicKey()],
     '#d': [dTagValue],
     limit: 1
-  }, writeRelays)).result
+  }, [...new Set([...writeRelays, ...nappRelays])])).result
 
   if (storedEvents.length === 0) return null
   return storedEvents.sort((a, b) => b.created_at - a.created_at)[0]

package/src/services/nostr-relays.js

@@ -15,6 +15,9 @@ export const freeRelays = [
   'wss://relay.damus.io',
   'wss://relay.nostr.band'
 ]
+export const nappRelays = [
+  'wss://relay.44billion.net'
+]
 
 // Interacts with Nostr relays
 export class NostrRelays {