nappup 1.3.0 → 1.4.1

package/README.md

@@ -27,7 +27,8 @@ nappup [directory] [options]
 | Flag | Description |
 |------|-------------|
 | `-s <secret_key>` | Your Nostr secret key (hex or nsec format) used to sign the application event. See [Authentication](#authentication) for alternatives. |
-| `-d <d_tag>` | The unique identifier (`d` tag) for your application. If omitted, defaults to the directory name. Avoid generic names like `dist` or `build` - use something unique among your other apps like `mycoolapp`. |
+| `-D <name>` | **Recommended**: A string to derive the identifier (`d` tag) from. This is the preferred way to set your app's identifier since you don't need to worry about the format - we'll handle the conversion for you. Just provide the application name and we'll ensure it's safely converted to a valid `d` tag. |
+| `-d <d_tag>` | The exact identifier (`d` tag) for your application. Only use this if you know the exact `d` tag you want. Otherwise, use `-D`. If both are omitted, defaults to deriving the identifier from 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. |
 | `--main` | Publish to the **main** release channel. This is the default behavior. |
@@ -65,7 +66,7 @@ NOSTR_SECRET_KEY=nsec1... nappup
 
 Upload a specific `dist` folder with a custom identifier to the `next` channel:
 ```bash
-nappup ./dist -s nsec1... -d myapp --next
+nappup ./dist -s nsec1... -D "My App #1" --next
 ```
 
 Force re-upload a draft:

package/bin/nappup/helpers.js

@@ -9,6 +9,7 @@ export function parseArgs (args) {
   let dir = null
   let sk = null
   let dTag = null
+  let dTagRaw = null
   let channel = null
   let shouldReupload = false
   let yes = false
@@ -20,6 +21,9 @@ export function parseArgs (args) {
     } else if (args[i] === '-d' && args[i + 1]) {
       dTag = args[i + 1]
       i++
+    } else if (args[i] === '-D' && args[i + 1]) {
+      dTagRaw = args[i + 1]
+      i++
     } else if (args[i] === '--main' && channel === null) {
       channel = 'main'
     } else if (args[i] === '--next' && channel === null) {
@@ -39,6 +43,7 @@ export function parseArgs (args) {
     dir: path.resolve(dir ?? '.'),
     sk,
     dTag,
+    dTagRaw,
     channel: channel || 'main',
     shouldReupload,
     yes

package/bin/nappup/index.js

@@ -11,7 +11,7 @@ import toApp from '#index.js'
 const args = parseArgs(process.argv.slice(2))
 await confirmArgs(args)
 
-const { dir, sk, dTag, channel, shouldReupload } = args
+const { dir, sk, dTag, dTagRaw, channel, shouldReupload } = args
 const fileList = await toFileList(getFiles(dir), dir)
 
-await toApp(fileList, await NostrSigner.create(sk), { log: console.log.bind(console), dTag, channel, shouldReupload })
+await toApp(fileList, await NostrSigner.create(sk), { log: console.log.bind(console), dTag, dTagRaw, channel, shouldReupload })

package/package.json

@@ -5,8 +5,8 @@
     "type": "git",
     "url": "git+https://github.com/44billion/nappup.git"
   },
-  "license": "GPL-3.0-or-later",
-  "version": "1.3.0",
+  "license": "MIT",
+  "version": "1.4.1",
   "description": "Nostr App Uploader",
   "type": "module",
   "scripts": {

package/src/index.js

@@ -16,7 +16,7 @@ export default async function (...args) {
   }
 }
 
-export async function toApp (fileList, nostrSigner, { log = () => {}, dTag, channel = 'main', shouldReupload = false } = {}) {
+export async function toApp (fileList, nostrSigner, { log = () => {}, dTag, dTagRaw, channel = 'main', shouldReupload = false } = {}) {
   if (!nostrSigner && typeof window !== 'undefined') nostrSigner = window.nostr
   if (!nostrSigner) throw new Error('No Nostr signer found')
   if (typeof window !== 'undefined' && nostrSigner === window.nostr) {
@@ -29,7 +29,7 @@ export async function toApp (fileList, nostrSigner, { log = () => {}, dTag, chan
   if (typeof dTag === 'string') {
     if (!isNostrAppDTagSafe(dTag)) throw new Error('dTag should be [A-Za-z0-9] with length ranging from 1 to 19')
   } else {
-    dTag = fileList[0].webkitRelativePath.split('/')[0].trim()
+    dTag = dTagRaw || fileList[0].webkitRelativePath.split('/')[0].trim()
     if (!isNostrAppDTagSafe(dTag)) dTag = await deriveNostrAppDTag(dTag || Math.random().toString(36))
   }
   let nmmr
@@ -344,16 +344,17 @@ async function maybeUploadStall ({
 
   if (!previous) {
     const tags = [
-      ['d', dTag],
-      ['c', '*']
+      ['d', dTag]
     ]
 
-    if (self) tags.push(['self', self])
-
-    if (countries) {
-      countries.forEach(c => tags.push(['country', c]))
+    if (countries && countries.length > 0) {
+      countries.forEach(c => tags.push(['c', c]))
+    } else {
+      tags.push(['c', '*'])
     }
 
+    if (self) tags.push(['self', self])
+
     if (categories) {
       let count = 0
       for (const [cat, subcats] of categories) {
@@ -444,8 +445,12 @@ async function maybeUploadStall ({
 
   // Update countries
   if (countries) {
-    removeTags('country')
-    countries.forEach(c => tags.push(['country', c]))
+    removeTags('c')
+    if (countries.length === 0) {
+      tags.push(['c', '*'])
+    } else {
+      countries.forEach(c => tags.push(['c', c]))
+    }
     changed = true
   }
 
@@ -503,12 +508,14 @@ async function maybeUploadStall ({
     return ['d', dTag]
   })
 
-  ensureTagValue('c', (existing) => {
-    if (!existing) return ['c', '*']
-    const currentValue = typeof existing[1] === 'string' ? existing[1].trim() : ''
-    if (currentValue === '') return ['c', '*']
-    return existing
-  })
+  if (!countries) {
+    ensureTagValue('c', (existing) => {
+      if (!existing) return ['c', '*']
+      const currentValue = typeof existing[1] === 'string' ? existing[1].trim() : ''
+      if (currentValue === '') return ['c', '*']
+      return existing
+    })
+  }
 
   const hasAuto = (field) => tags.some(tag => Array.isArray(tag) && tag[0] === 'auto' && tag[1] === field)
   const removeAuto = (field) => {