nappup 2.2.1 → 2.3.1

package/README.md

@@ -29,7 +29,7 @@ nappup [directory] [options]
 | `-s <secret_key>` | Your Nostr secret key (hex, nsec, or `bunker://` URL) used to sign the application event. See [Authentication](#authentication) for alternatives. |
 | `-d <d_tag>` | The identifier (`d` tag) for your application. Any UTF-8 text up to 260 characters. If omitted, defaults to the directory name. Avoid generic names like `dist` or `build` - use something unique among your other apps like `mycoolapp`. |
 | `-y` | Skip confirmation prompt. Useful for CI/CD pipelines or automated scripts. |
-| `-r` | Force re-upload. By default, Napp Up! might skip files that haven't changed. Use this flag to ensure everything is pushed fresh. |
+| `-r` | Force re-upload. By default, Napp Up! might skip files that haven't changed. Use this flag to ensure everything is pushed fresh; it does not create a new app version unless a file path or hash changes. |
 | `--main` | Publish to the **main** release channel. This is the default behavior. |
 | `--next` | Publish to the **next** release channel. Ideal for beta testing or staging builds. |
 | `--draft` | Publish to the **draft** release channel. Use this for internal testing or work-in-progress builds. |
@@ -113,6 +113,13 @@ nappup ~/my-repos/projectx/build/projectx --draft -r
 
 ## Programmatic Usage
 
+Each published manifest includes an aggregate `x` tag that identifies the app
+version from its file path/hash mappings. Updating only manifest metadata or
+forcing a re-upload preserves that aggregate. The `published_at` tag records
+the first publication time of that aggregate and is preserved across later
+metadata revisions, while the event's `created_at` records the latest manifest
+revision.
+
 Napp Up! also exports a function that works in both Node.js and the browser, so you can integrate app uploads directly into your own tooling:
 
 ```js

package/bin/nappup/helpers.js

@@ -188,10 +188,12 @@ export async function toFileList (filesIterator, dir) {
   const fileList = []
   for await (const f of filesIterator) {
     const fileType = mime.lookup(f)
+    const { size } = await fs.promises.stat(f)
     const file = {
       stream: () => Readable.toWeb(fs.createReadStream(f)),
       webkitRelativePath: path.relative(dir.replace(/\/[^/]*$/, ''), f),
-      type: fileType || (await fileTypeFromFile(f))?.mime || ''
+      type: fileType || (await fileTypeFromFile(f))?.mime || '',
+      size
     }
     fileList.push(file)
   }

package/package.json

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

package/src/index.js

@@ -1,5 +1,5 @@
 import NMMR from 'nmmr'
-import { appEncode } from 'libp2r2p/nip19'
+import { appEncode, npubEncode } from 'libp2r2p/nip19'
 import nostrRelays from '#services/nostr-relays.js'
 import { getRelays } from '#helpers/signer.js'
 import { streamToChunks, streamToText } from '#helpers/stream.js'
@@ -79,7 +79,8 @@ export async function toApp (fileList, nostrSigner, {
 
   const writeRelays = [...new Set((await nostrSigner.getRelays()).write
     .map(relay => relay.trim().replace(/\/$/, '')))]
-  log(`Found ${writeRelays.length} outbox relays for pubkey ${await nostrSigner.getPublicKey()}:\n${writeRelays.join(', ')}`)
+  const npub = npubEncode(await nostrSigner.getPublicKey())
+  log(`Found ${writeRelays.length} outbox relays for pubkey ${npub}:\n${writeRelays.join(', ')}`)
   if (!writeRelays.length) throw new Error('No outbox relays found')
 
   if (typeof dTag === 'string') {

package/src/services/site-manifest.js

@@ -1,10 +1,12 @@
 import { NAPP_CATEGORIES } from '#config/napp-categories.js'
 import nostrRelays, { nappRelays } from '#services/nostr-relays.js'
 import { throttledSendEvent } from '#services/irfs-upload.js'
+import { sha256 } from '@noble/hashes/sha2.js'
+import { bytesToBase16 } from '#helpers/base16.js'
 
 const MANAGED_MANIFEST_TAGS = new Set([
   'd', 'service', 'path', 'r', 'name', 'summary', 'description', 'self',
-  'c', 'l', 't', 'auto', 'icon', 'key_art', 'screenshot'
+  'c', 'l', 't', 'auto', 'icon', 'key_art', 'screenshot', 'x', 'published_at'
 ])
 
 export function normalizeManifestPath (value) {
@@ -25,6 +27,37 @@ function validRoot (root) {
   return typeof root === 'string' && /^[0-9a-f]{64}$/.test(root)
 }
 
+function manifestAggregateLines (manifest) {
+  const tags = Array.isArray(manifest?.tags) ? manifest.tags : []
+  const service = tags.find(tag => Array.isArray(tag) && tag[0] === 'service')?.[1]
+  const lines = []
+
+  if (service === 'irfs') {
+    for (const tag of tags) {
+      if (!Array.isArray(tag) || tag[0] !== 'r' || !validRoot(tag[1])) continue
+      for (const field of tag.slice(2)) {
+        if (typeof field !== 'string' || !field.startsWith('path ')) continue
+        const path = normalizeManifestPath(field.slice(5))
+        lines.push(`${tag[1]} /${path}\n`)
+      }
+    }
+  } else {
+    for (const tag of tags) {
+      if (!Array.isArray(tag) || tag[0] !== 'path' || !validRoot(tag[2])) continue
+      const path = normalizeManifestPath(tag[1])
+      lines.push(`${tag[2]} /${path}\n`)
+    }
+  }
+
+  return lines
+}
+
+export function getManifestAggregateHash (manifest) {
+  const lines = manifestAggregateLines(manifest)
+  if (!lines.length) throw new Error('Site manifest must reference at least one file')
+  return bytesToBase16(sha256(new TextEncoder().encode(lines.sort().join(''))))
+}
+
 function decimalSize (size) {
   if (!Number.isSafeInteger(size) || size < 0) {
     throw new Error('Asset size must be a non-negative safe integer')
@@ -138,7 +171,7 @@ function buildMetadataTags ({
 
 export function buildManifestTags ({
   dTag, uploadService, fileMetadata = [], icon, keyArt = [], screenshots = [],
-  previousTags = [], ...metadata
+  previousTags = [], publishedAt, ...metadata
 }) {
   if (uploadService !== 'irfs' && uploadService !== 'blossom') {
     throw new Error('Unknown upload service')
@@ -153,10 +186,21 @@ export function buildManifestTags ({
     .slice(0, 10)
     .map(tag => [...tag])
 
+  if (!Number.isSafeInteger(publishedAt) || publishedAt < 0) {
+    throw new Error('published_at must be a non-negative safe integer')
+  }
+
+  const referenceTags = buildReferenceTags(uploadService, fileMetadata, media)
+  const aggregateHash = getManifestAggregateHash({
+    tags: [...referenceTags, ['service', uploadService]]
+  })
+
   return [
     ['d', dTag],
-    ...buildReferenceTags(uploadService, fileMetadata, media),
+    ...referenceTags,
     ['service', uploadService],
+    ['x', aggregateHash, 'aggregate'],
+    ['published_at', String(publishedAt)],
     ...buildMetadataTags({ ...metadata, hasIcon: Boolean(icon) }),
     ...unknownTags
   ]
@@ -190,8 +234,34 @@ export async function uploadSiteManifest ({
   }, relays, { timeoutAfterFirstEose: null })).result
   events.sort(newestFirst)
   const previous = events[0]
+
+  const now = Math.floor(Date.now() / 1000)
+  const createdAt = Math.max(now, (previous?.created_at ?? -1) + 1)
+  if (createdAt > now + 172800) throw new Error('Existing manifest timestamp is too far in the future to replace safely')
+
+  const prospectiveTags = buildManifestTags({
+    dTag, uploadService, fileMetadata, previousTags: previous?.tags,
+    publishedAt: createdAt, ...metadata
+  })
+  const aggregateHash = getManifestAggregateHash({ tags: prospectiveTags })
+  let previousAggregateHash = null
+  try {
+    if (previous) previousAggregateHash = getManifestAggregateHash(previous)
+  } catch (_) {}
+  const isSameVersion = previousAggregateHash === aggregateHash
+  const previousPublishedAt = previous?.tags?.find(tag => tag[0] === 'published_at')?.[1]
+  const parsedPreviousPublishedAt = typeof previousPublishedAt === 'string' && /^(0|[1-9][0-9]*)$/.test(previousPublishedAt)
+    ? Number(previousPublishedAt)
+    : null
+  const fallbackPublishedAt = Number.isSafeInteger(previous?.created_at) && previous.created_at >= 0
+    ? previous.created_at
+    : createdAt
+  const publishedAt = isSameVersion && Number.isSafeInteger(parsedPreviousPublishedAt)
+    ? parsedPreviousPublishedAt
+    : (isSameVersion ? fallbackPublishedAt : createdAt)
   const tags = buildManifestTags({
-    dTag, uploadService, fileMetadata, previousTags: previous?.tags, ...metadata
+    dTag, uploadService, fileMetadata, previousTags: previous?.tags,
+    publishedAt, ...metadata
   })
 
   if (!shouldReupload && previous && previous.content === '' && JSON.stringify(previous.tags) === JSON.stringify(tags)) {
@@ -208,9 +278,6 @@ export async function uploadSiteManifest ({
     return previous
   }
 
-  const now = Math.floor(Date.now() / 1000)
-  const createdAt = Math.max(now, (previous?.created_at ?? -1) + 1)
-  if (createdAt > now + 172800) throw new Error('Existing manifest timestamp is too far in the future to replace safely')
   const event = await signer.signEvent({ kind, tags, content: '', created_at: createdAt })
   await throttledSendEvent(event, relays, { pause, trailingPause: true, log })
   return event