nappup 2.3.0 → 2.3.2

package/bin/nappup/helpers.js

@@ -153,7 +153,7 @@ export async function readEnvSetValue (args, {
 }
 
 export async function confirmArgs (args) {
-  if (args.yes) return
+  if (args.yes) return true
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
@@ -162,14 +162,18 @@ export async function confirmArgs (args) {
     return new Promise(resolve => rl.question(query, resolve))
   }
   const answer = await askQuestion(
-    `Publish app from '${args.dir}' as '${args.dTag}' to the ${args.channel} release channel? (y/n) `
+    confirmationPrompt(args)
   )
+  rl.close()
   if (answer.toLowerCase() !== 'y') {
     console.log('Operation cancelled by user.')
-    rl.close()
-    process.exit(0)
+    return false
   }
-  rl.close()
+  return true
+}
+
+export function confirmationPrompt (args) {
+  return `Publish app from '${args.dir}' as '${args.dTag}' to the ${args.channel} release channel using ${args.npub}? (y/n) `
 }
 
 export async function * getFiles (dir) {
@@ -188,10 +192,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/bin/nappup/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import path from 'node:path'
+import { npubEncode } from 'libp2r2p/nip19'
 import { GENERIC_BUILD_FOLDER_NAMES } from '#helpers/app.js'
 import {
   parseArgs,
@@ -57,8 +58,6 @@ async function upload (args, dotenvState) {
   }
   args.dTag = dTag
 
-  await confirmArgs(args)
-  const fileList = await toFileList(getFiles(dir), dir)
   const bunkerUrl = sk?.startsWith('bunker://')
     ? sk
     : !sk && process.env.NOSTR_SECRET_KEY?.startsWith('bunker://')
@@ -73,10 +72,17 @@ async function upload (args, dotenvState) {
     })
   } else {
     const { default: NostrSigner } = await import('#services/nostr-signer.js')
-    signer = await NostrSigner.create(sk)
+    signer = await NostrSigner.create(sk, {
+      deferInitialization: true,
+      dotenvFilePath: dotenvState.filePath
+    })
   }
 
   try {
+    args.npub = npubEncode(await signer.getPublicKey())
+    if (!await confirmArgs(args)) return
+    await signer.initialize?.()
+    const fileList = await toFileList(getFiles(dir), dir)
     const { default: toApp } = await import('#index.js')
     await toApp(fileList, signer, { log: console.log.bind(console), dTag, channel, shouldReupload })
   } finally {

package/package.json

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

package/src/index.js

@@ -79,7 +79,7 @@ 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(', ')}`)
+  log(`Found ${writeRelays.length} outbox relays:\n${writeRelays.join(', ')}`)
   if (!writeRelays.length) throw new Error('No outbox relays found')
 
   if (typeof dTag === 'string') {

package/src/services/nostr-signer.js

@@ -12,15 +12,19 @@ const createToken = Symbol('createToken')
 export default class NostrSigner {
   #secretKey // bytes
   #publicKey // hex
+  #needsInitialization
+  #dotenvFilePath
 
-  constructor (token, skBytes) {
+  constructor (token, skBytes, { needsInitialization = false, dotenvFilePath } = {}) {
     if (token !== createToken) throw new Error('Use NostrSigner.create(?sk) to instantiate this class.')
     if (!skBytes) throw new Error('Secret key missing.')
 
     this.#secretKey = skBytes
+    this.#needsInitialization = needsInitialization
+    this.#dotenvFilePath = dotenvFilePath
   }
 
-  static async create (sk) {
+  static async create (sk, { deferInitialization = false, dotenvFilePath } = {}) {
     if (sk) {
       if (sk.startsWith('nsec')) sk = nsecDecode(sk)
       return new this(createToken, base16ToBytes(sk))
@@ -37,13 +41,26 @@ export default class NostrSigner {
     } else {
       isNewSk = true
       skBytes = generateSecretKey()
-      setEncryptedDotenvValue('NOSTR_SECRET_KEY', nsecEncode(bytesToBase16(skBytes)))
     }
-    const ret = new this(createToken, skBytes)
-    if (isNewSk) await ret.#initSk(sk)
+    const ret = new this(createToken, skBytes, {
+      needsInitialization: isNewSk,
+      dotenvFilePath
+    })
+    if (isNewSk && !deferInitialization) await ret.initialize()
     return ret
   }
 
+  async initialize () {
+    if (!this.#needsInitialization) return
+    setEncryptedDotenvValue(
+      'NOSTR_SECRET_KEY',
+      nsecEncode(bytesToBase16(this.#secretKey)),
+      this.#dotenvFilePath ? { filePath: this.#dotenvFilePath } : undefined
+    )
+    this.#needsInitialization = false
+    await this.#initSk()
+  }
+
   async getRelays () {
     return getRelays.call(this)
   }