@capgo/cli 4.12.12 → 4.12.14-beta.0

package/src/init.ts

@@ -1,8 +1,8 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
-import path from 'node:path'
 import type { ExecSyncOptions } from 'node:child_process'
 import { execSync, spawnSync } from 'node:child_process'
-import process from 'node:process'
+import { exit } from 'node:process'
+import { join } from 'node:path'
 import * as p from '@clack/prompts'
 import type LogSnag from 'logsnag'
 import semver from 'semver'
@@ -16,7 +16,7 @@ import { addAppInternal } from './app/add'
 import { checkLatest } from './api/update'
 import type { Options } from './api/app'
 import type { Organization } from './utils'
-import { convertAppName, createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findSavedKey, getConfig, getOrganization, getPMAndCommand, useLogSnag, verifyUser } from './utils'
+import { convertAppName, createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findSavedKey, getConfig, getOrganization, getPMAndCommand, readPackageJson, useLogSnag, verifyUser } from './utils'
 
 interface SuperOptions extends Options {
   local: boolean
@@ -88,7 +88,7 @@ function cleanupStepsDone() {
 async function cancelCommand(command: boolean | symbol, orgId: string, snag: LogSnag) {
   if (p.isCancel(command)) {
     await markSnag('onboarding-v2', orgId, snag, 'canceled', '🤷')
-    process.exit()
+    exit()
   }
 }
 
@@ -148,20 +148,20 @@ async function step4(orgId: string, snag: LogSnag, apikey: string, appId: string
     const s = p.spinner()
     s.start(`Checking if @capgo/capacitor-updater is installed`)
     let versionToInstall = 'latest'
-    const pack = JSON.parse(readFileSync('package.json').toString())
+    const pack = await readPackageJson()
     let coreVersion = pack.dependencies['@capacitor/core'] || pack.devDependencies['@capacitor/core']
     coreVersion = coreVersion?.replace('^', '').replace('~', '')
     if (!coreVersion) {
       s.stop('Error')
       p.log.warn(`Cannot find @capacitor/core in package.json, please run \`capgo init\` in a capacitor project`)
       p.outro(`Bye 👋`)
-      process.exit()
+      exit()
     }
     else if (semver.lt(coreVersion, '5.0.0')) {
       s.stop('Error')
       p.log.warn(`@capacitor/core version is ${coreVersion}, please update to Capacitor v5 first: ${urlMigrateV5}`)
       p.outro(`Bye 👋`)
-      process.exit()
+      exit()
     }
     else if (semver.lt(coreVersion, '6.0.0')) {
       s.stop(`@capacitor/core version is ${coreVersion}, please update to Capacitor v6: ${urlMigrateV6} to access the best features of Capgo`)
@@ -171,7 +171,7 @@ async function step4(orgId: string, snag: LogSnag, apikey: string, appId: string
       s.stop('Error')
       p.log.warn(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm, bun or yarn`)
       p.outro(`Bye 👋`)
-      process.exit()
+      exit()
     }
     // // use pm to install capgo
     // // run command pm install @capgo/capacitor-updater@latest
@@ -201,16 +201,16 @@ async function step5(orgId: string, snag: LogSnag, apikey: string, appId: string
     const projectType = await findProjectType()
     if (projectType === 'nuxtjs-js' || projectType === 'nuxtjs-ts') {
       // Nuxt.js specific logic
-      const nuxtDir = path.join('plugins')
+      const nuxtDir = join('plugins')
       if (!existsSync(nuxtDir)) {
         mkdirSync(nuxtDir, { recursive: true })
       }
       let nuxtFilePath
       if (projectType === 'nuxtjs-ts') {
-        nuxtFilePath = path.join(nuxtDir, 'capacitorUpdater.client.ts')
+        nuxtFilePath = join(nuxtDir, 'capacitorUpdater.client.ts')
       }
       else {
-        nuxtFilePath = path.join(nuxtDir, 'capacitorUpdater.client.js')
+        nuxtFilePath = join(nuxtDir, 'capacitorUpdater.client.js')
       }
       const nuxtFileContent = `
         import { CapacitorUpdater } from '@capgo/capacitor-updater'
@@ -257,7 +257,7 @@ async function step5(orgId: string, snag: LogSnag, apikey: string, appId: string
           p.log.warn(`Cannot find the latest version of ${projectType}, you might need to upgrade to the latest version of ${projectType}`)
         }
         p.outro(`Bye 👋`)
-        process.exit()
+        exit()
       }
 
       // Open main file and inject codeInject
@@ -270,7 +270,7 @@ async function step5(orgId: string, snag: LogSnag, apikey: string, appId: string
         s.stop('Error')
         p.log.warn(`Cannot find import line in main file, use manual installation: https://capgo.app/docs/plugin/installation/`)
         p.outro(`Bye 👋`)
-        process.exit()
+        exit()
       }
 
       if (mainFileContent.includes(codeInject)) {
@@ -302,7 +302,7 @@ async function step6(orgId: string, snag: LogSnag, apikey: string, appId: string
       s.stop('Error')
       p.log.warn(`Cannot create key ❌`)
       p.outro(`Bye 👋`)
-      process.exit(1)
+      exit(1)
     }
     else {
       s.stop(`key created 🔑`)
@@ -321,13 +321,13 @@ async function step7(orgId: string, snag: LogSnag, apikey: string, appId: string
     const projectType = await findProjectType()
     const buildCommand = await findBuildCommandForProjectType(projectType)
     s.start(`Running: ${pm.pm} run ${buildCommand} && ${pm.runner} cap sync`)
-    const pack = JSON.parse(readFileSync('package.json').toString())
+    const pack = await readPackageJson()
     // check in script build exist
     if (!pack.scripts[buildCommand]) {
       s.stop('Error')
       p.log.warn(`Cannot find ${buildCommand} script in package.json, please add it and run \`capgo init\` again`)
       p.outro(`Bye 👋`)
-      process.exit()
+      exit()
     }
     execSync(`${pm.pm} run ${buildCommand} && ${pm.runner} cap sync`, execOption as ExecSyncOptions)
     s.stop(`Build & Sync Done ✅`)
@@ -353,7 +353,7 @@ async function step8(orgId: string, snag: LogSnag, apikey: string, appId: string
       s.stop('Error')
       p.log.warn(`Upload failed ❌`)
       p.outro(`Bye 👋`)
-      process.exit()
+      exit()
     }
     else {
       s.stop(`Upload Done ✅`)
@@ -379,7 +379,7 @@ async function step9(orgId: string, snag: LogSnag) {
     })
     if (p.isCancel(plaformType)) {
       p.outro(`Bye 👋`)
-      process.exit()
+      exit()
     }
 
     const platform = plaformType as 'ios' | 'android'
@@ -413,8 +413,8 @@ export async function initApp(apikeyCommand: string, appId: string, options: Sup
   p.intro(`Capgo onboarding 🛫`)
   await checkLatest()
   const snag = useLogSnag()
-  const config = await getConfig()
-  appId = appId || config?.app?.appId
+  const extConfig = await getConfig()
+  appId = appId || extConfig?.config?.appId
   const apikey = apikeyCommand || findSavedKey()
 
   const log = p.spinner()
@@ -483,7 +483,7 @@ export async function initApp(apikeyCommand: string, appId: string, options: Sup
   catch (e) {
     console.error(e)
     p.log.error(`Error during onboarding, please try again later`)
-    process.exit(1)
+    exit(1)
   }
 
   p.log.info(`Welcome onboard ✈️!`)
@@ -491,5 +491,5 @@ export async function initApp(apikeyCommand: string, appId: string, options: Sup
   p.log.info(`Next time use \`${pm.runner} @capgo/cli@latest bundle upload\` to only upload your bundle`)
   p.log.info(`If you have any issue try to use the debug command \`${pm.runner} @capgo/cli@latest app debug\``)
   p.outro(`Bye 👋`)
-  process.exit()
+  exit()
 }

package/src/key.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs'
 import { program } from 'commander'
-import { writeConfig } from '@capacitor/cli/dist/config'
-import * as p from '@clack/prompts'
+import { intro, log, outro } from '@clack/prompts'
+import { writeConfig } from './config'
 import { createRSA } from './api/crypto'
 import { baseKey, baseKeyPub, getConfig } from './utils'
 import { checkLatest } from './api/update'
@@ -14,12 +14,11 @@ interface Options {
   force?: boolean
 }
 
-export async function saveKey(options: saveOptions, log = true) {
-  if (log)
-    p.intro(`Save keys 🔑`)
+export async function saveKey(options: saveOptions, logg = true) {
+  if (logg)
+    intro(`Save keys 🔑`)
 
-  const config = await getConfig()
-  const { extConfig } = config.app
+  const extConfig = await getConfig()
 
   const keyPath = options.key || baseKey
   // check if publicKey exist
@@ -27,8 +26,8 @@ export async function saveKey(options: saveOptions, log = true) {
   let privateKey = options.keyData || ''
 
   if (!existsSync(keyPath) && !privateKey) {
-    if (log) {
-      p.log.error(`Cannot find public key ${keyPath} or as keyData option or in ${config.app.extConfigFilePath}`)
+    if (logg) {
+      log.error(`Cannot find public key ${keyPath} or as keyData option or in ${extConfig.path}`)
       program.error('')
     }
     else {
@@ -41,43 +40,43 @@ export async function saveKey(options: saveOptions, log = true) {
     privateKey = keyFile.toString()
   }
 
-  if (extConfig) {
-    if (!extConfig.plugins) {
-      extConfig.plugins = {
+  if (extConfig?.config) {
+    if (!extConfig.config.plugins) {
+      extConfig.config.plugins = {
         extConfig: {},
         CapacitorUpdater: {},
       }
     }
-    if (!extConfig.plugins.CapacitorUpdater)
-      extConfig.plugins.CapacitorUpdater = {}
+    if (!extConfig.config.plugins.CapacitorUpdater)
+      extConfig.config.plugins.CapacitorUpdater = {}
 
-    extConfig.plugins.CapacitorUpdater.privateKey = privateKey
+    extConfig.config.plugins.CapacitorUpdater.privateKey = privateKey
     // console.log('extConfig', extConfig)
-    writeConfig(extConfig, config.app.extConfigFilePath)
+    await writeConfig(extConfig)
   }
   if (log) {
-    p.log.success(`private key saved into ${config.app.extConfigFilePath} file in local directory`)
-    p.log.success(`your app will decode the zip archive with this key`)
+    log.success(`private key saved into ${extConfig.path} file in local directory`)
+    log.success(`your app will decode the zip archive with this key`)
   }
   return true
 }
 export async function saveKeyCommand(options: saveOptions) {
-  p.intro(`Save keys 🔑`)
+  intro(`Save keys 🔑`)
   await checkLatest()
   await saveKey(options)
 }
 
-export async function createKey(options: Options, log = true) {
+export async function createKey(options: Options, logg = true) {
   // write in file .capgo the apikey in home directory
-  if (log)
-    p.intro(`Create keys 🔑`)
+  if (logg)
+    intro(`Create keys 🔑`)
 
   const { publicKey, privateKey } = createRSA()
 
   // check if baseName already exist
   if (existsSync(baseKeyPub) && !options.force) {
-    p.log.error('Public Key already exists, use --force to overwrite')
-    if (log) {
+    log.error('Public Key already exists, use --force to overwrite')
+    if (logg) {
       program.error('')
     }
     else {
@@ -86,8 +85,8 @@ export async function createKey(options: Options, log = true) {
   }
   writeFileSync(baseKeyPub, publicKey)
   if (existsSync(baseKey) && !options.force) {
-    p.log.error('Private Key already exists, use --force to overwrite')
-    if (log) {
+    log.error('Private Key already exists, use --force to overwrite')
+    if (logg) {
       program.error('')
     }
     else {
@@ -96,36 +95,36 @@ export async function createKey(options: Options, log = true) {
   }
   writeFileSync(baseKey, privateKey)
 
-  const config = await getConfig()
-  const { extConfig } = config.app
-  if (extConfig) {
-    if (!extConfig.plugins) {
-      extConfig.plugins = {
+  const extConfig = await getConfig()
+  if (extConfig?.config) {
+    if (!extConfig.config.plugins) {
+      extConfig.config.plugins = {
         extConfig: {},
         CapacitorUpdater: {},
       }
     }
 
-    if (!extConfig.plugins.CapacitorUpdater) {
-      extConfig.plugins.CapacitorUpdater = {}
+    if (!extConfig.config.plugins.CapacitorUpdater) {
+      extConfig.config.plugins.CapacitorUpdater = {}
     }
 
-    extConfig.plugins.CapacitorUpdater.privateKey = privateKey
+    const flattenPrivateKey = privateKey.replace(/\\n/g, '\\n')
+    extConfig.config.plugins.CapacitorUpdater.privateKey = flattenPrivateKey
     // console.log('extConfig', extConfig)
-    writeConfig(extConfig, config.app.extConfigFilePath)
+    writeConfig(extConfig)
   }
 
-  if (log) {
-    p.log.success('Your RSA key has been generated')
-    p.log.success(`Public key saved in ${baseKeyPub}`)
-    p.log.success('This key will be use to encrypt your bundle before sending it to Capgo')
-    p.log.success('Keep it safe')
-    p.log.success('Than make it unreadable by Capgo and unmodifiable by anyone')
-    p.log.success(`Private key saved in ${config.app.extConfigFilePath}`)
-    p.log.success('Your app will be the only one having it')
-    p.log.success('Only your users can decrypt your update')
-    p.log.success('Only you can send them an update')
-    p.outro(`Done ✅`)
+  if (logg) {
+    log.success('Your RSA key has been generated')
+    log.success(`Public key saved in ${baseKeyPub}`)
+    log.success('This key will be use to encrypt your bundle before sending it to Capgo')
+    log.success('Keep it safe')
+    log.success('Than make it unreadable by Capgo and unmodifiable by anyone')
+    log.success(`Private key saved in ${extConfig.path}`)
+    log.success('Your app will be the only one having it')
+    log.success('Only your users can decrypt your update')
+    log.success('Only you can send them an update')
+    outro(`Done ✅`)
   }
   return true
 }

package/src/login.ts

@@ -1,8 +1,8 @@
 import { appendFileSync, existsSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
-import process from 'node:process'
+import { exit } from 'node:process'
 import { program } from 'commander'
-import * as p from '@clack/prompts'
+import { intro, log, outro } from '@clack/prompts'
 import { createSupabaseClient, useLogSnag, verifyUser } from './utils'
 import { checkLatest } from './api/update'
 
@@ -16,11 +16,11 @@ export async function doLoginExists() {
 
 export async function login(apikey: string, options: Options, shouldExit = true) {
   if (shouldExit)
-    p.intro(`Login to Capgo`)
+    intro(`Login to Capgo`)
 
   if (!apikey) {
     if (shouldExit) {
-      p.log.error('Missing API key, you need to provide a API key to upload your bundle')
+      log.error('Missing API key, you need to provide a API key to upload your bundle')
       program.error('')
     }
     return false
@@ -33,7 +33,7 @@ export async function login(apikey: string, options: Options, shouldExit = true)
 
     if (local) {
       if (!existsSync('.git')) {
-        p.log.error('To use local you should be in a git repository')
+        log.error('To use local you should be in a git repository')
         program.error('')
       }
       writeFileSync('.capgo', `${apikey}\n`)
@@ -52,15 +52,15 @@ export async function login(apikey: string, options: Options, shouldExit = true)
       user_id: userId,
       notify: false,
     }).catch()
-    p.log.success(`login saved into .capgo file in ${local ? 'local' : 'home'} directory`)
+    log.success(`login saved into .capgo file in ${local ? 'local' : 'home'} directory`)
   }
   catch (e) {
-    p.log.error(`Error while saving login`)
-    process.exit(1)
+    log.error(`Error while saving login`)
+    exit(1)
   }
   if (shouldExit) {
-    p.outro('Done ✅')
-    process.exit()
+    outro('Done ✅')
+    exit()
   }
   return true
 }

package/src/user/account.ts

@@ -1,11 +1,11 @@
-import * as p from '@clack/prompts'
+import { intro, outro } from '@clack/prompts'
 import { createSupabaseClient, findSavedKey, verifyUser } from '../utils'
 import type { Options } from '../api/app'
 
 export async function getUserId(options: Options) {
-  p.intro(`Getting user id`)
+  intro(`Getting user id`)
   options.apikey = options.apikey || findSavedKey()
   const supabase = await createSupabaseClient(options.apikey)
   const userId = await verifyUser(supabase, options.apikey, ['read'])
-  p.outro(`Done ✅: ${userId}`)
+  outro(`Done ✅: ${userId}`)
 }