@capgo/cli 4.12.12 → 4.12.14-beta.0

package/src/bundle/cleanup.ts

@@ -1,8 +1,8 @@
-import process from 'node:process'
+import { exit } from 'node:process'
 import { program } from 'commander'
 import semver from 'semver/preload'
-import * as p from '@clack/prompts'
 import type { SupabaseClient } from '@supabase/supabase-js'
+import { confirm as confirmC, intro, isCancel, log, outro } from '@clack/prompts'
 import type { Database } from '../types/supabase.types'
 import type { OptionsBase } from '../utils'
 import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, getHumanDate, verifyUser } from '../utils'
@@ -20,7 +20,7 @@ interface Options extends OptionsBase {
 async function removeVersions(toRemove: Database['public']['Tables']['app_versions']['Row'][], supabase: SupabaseClient<Database>, appid: string) {
   // call deleteSpecificVersion one by one from toRemove sync
   for await (const row of toRemove) {
-    p.log.warn(`Removing ${row.name} created on ${(getHumanDate(row.created_at))}`)
+    log.warn(`Removing ${row.name} created on ${(getHumanDate(row.created_at))}`)
     await deleteSpecificVersion(supabase, appid, row.name)
   }
 }
@@ -35,21 +35,21 @@ function getRemovableVersionsInSemverRange(data: Database['public']['Tables']['a
   return toRemove
 }
 
-export async function cleanupBundle(appid: string, options: Options) {
-  p.intro(`Cleanup versions in Capgo`)
+export async function cleanupBundle(appId: string, options: Options) {
+  intro(`Cleanup versions in Capgo`)
   await checkLatest()
   options.apikey = options.apikey || findSavedKey()
   const { bundle, keep = 4 } = options
   const force = options.force || false
 
-  const config = await getConfig()
-  appid = appid || config?.app?.appId
+  const extConfig = await getConfig()
+  appId = appId || extConfig?.config?.appId
   if (!options.apikey) {
-    p.log.error('Missing API key, you need to provide an API key to delete your app')
+    log.error('Missing API key, you need to provide an API key to delete your app')
     program.error('')
   }
-  if (!appid) {
-    p.log.error('Missing argument, you need to provide a appid, or be in a capacitor project')
+  if (!appId) {
+    log.error('Missing argument, you need to provide a appid, or be in a capacitor project')
     program.error('')
   }
   const supabase = await createSupabaseClient(options.apikey)
@@ -57,27 +57,27 @@ export async function cleanupBundle(appid: string, options: Options) {
   await verifyUser(supabase, options.apikey, ['write', 'all'])
 
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.write)
-  p.log.info(`Querying all available versions in Capgo`)
+  await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.write)
+  log.info(`Querying all available versions in Capgo`)
 
   // Get all active app versions we might possibly be able to cleanup
-  let allVersions: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[] = await getActiveAppVersions(supabase, appid)
+  let allVersions: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[] = await getActiveAppVersions(supabase, appId)
 
-  const versionInUse = await getChannelsVersion(supabase, appid)
+  const versionInUse = await getChannelsVersion(supabase, appId)
 
-  p.log.info(`Total active versions in Capgo: ${allVersions?.length}`)
+  log.info(`Total active versions in Capgo: ${allVersions?.length}`)
   if (allVersions?.length === 0) {
-    p.log.error('No versions found, aborting cleanup')
+    log.error('No versions found, aborting cleanup')
     return
   }
   if (bundle) {
     const nextMajor = `${semver.inc(bundle, 'major')}`
-    p.log.info(`Querying available versions in Capgo between ${bundle} and ${nextMajor}`)
+    log.info(`Querying available versions in Capgo between ${bundle} and ${nextMajor}`)
 
     // Get all app versions that are in the given range
     allVersions = getRemovableVersionsInSemverRange(allVersions, bundle, nextMajor) as (Database['public']['Tables']['app_versions']['Row'] & { keep: string })[]
 
-    p.log.info(`Active versions in Capgo between ${bundle} and ${nextMajor}: ${allVersions?.length}`)
+    log.info(`Active versions in Capgo between ${bundle} and ${nextMajor}: ${allVersions?.length}`)
   }
 
   // Slice to keep and remove
@@ -102,22 +102,22 @@ export async function cleanupBundle(appid: string, options: Options) {
   })
 
   if (toRemove.length === 0) {
-    p.log.warn('Nothing to be removed, aborting removal...')
+    log.warn('Nothing to be removed, aborting removal...')
     return
   }
   displayBundles(allVersions)
   // Check user wants to clean that all up
   if (!force) {
-    const doDelete = await p.confirm({ message: 'Do you want to continue removing the versions specified?' })
-    if (p.isCancel(doDelete) || !doDelete) {
-      p.log.warn('Not confirmed, aborting removal...')
-      process.exit()
+    const doDelete = await confirmC({ message: 'Do you want to continue removing the versions specified?' })
+    if (isCancel(doDelete) || !doDelete) {
+      log.warn('Not confirmed, aborting removal...')
+      exit()
     }
   }
 
   // Yes, lets clean it up
-  p.log.success('You have confirmed removal, removing versions now')
-  await removeVersions(toRemove, supabase, appid)
-  p.outro(`Done ✅`)
-  process.exit()
+  log.success('You have confirmed removal, removing versions now')
+  await removeVersions(toRemove, supabase, appId)
+  outro(`Done ✅`)
+  exit()
 }

package/src/bundle/compatibility.ts

@@ -1,6 +1,6 @@
-import * as p from '@clack/prompts'
 import { program } from 'commander'
 import { Table } from 'console-table-printer'
+import { intro, log } from '@clack/prompts'
 import type { OptionsBase } from '../utils'
 import { OrganizationPerm, checkCompatibility, createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
@@ -11,24 +11,24 @@ interface Options extends OptionsBase {
 }
 
 export async function checkCompatibilityCommand(appId: string, options: Options) {
-  p.intro(`Check compatibility`)
+  intro(`Check compatibility`)
   options.apikey = options.apikey || findSavedKey()
-  const config = await getConfig()
-  appId = appId || config?.app?.appId
+  const extConfig = await getConfig()
+  appId = appId || extConfig?.config?.appId
 
   const { channel } = options
 
   if (!channel) {
-    p.log.error('Missing argument, you need to provide a channel')
+    log.error('Missing argument, you need to provide a channel')
     program.error('')
   }
 
   if (!options.apikey) {
-    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('')
   }
   if (!appId) {
-    p.log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
+    log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
     program.error('')
   }
 
@@ -66,5 +66,5 @@ export async function checkCompatibilityCommand(appId: string, options: Options)
     })
   })
 
-  p.log.success(t.render())
+  log.success(t.render())
 }

package/src/bundle/decrypt.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs'
-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 { decryptSource } from '../api/crypto'
 import { baseKey, getConfig } from '../utils'
 import { checkLatest } from '../api/update'
@@ -12,12 +12,12 @@ interface Options {
 }
 
 export async function decryptZip(zipPath: string, ivsessionKey: string, options: Options) {
-  p.intro(`Decrypt zip file`)
+  intro(`Decrypt zip file`)
   await checkLatest()
   // write in file .capgo the apikey in home directory
 
   if (!existsSync(zipPath)) {
-    p.log.error(`Zip not found at the path ${zipPath}`)
+    log.error(`Zip not found at the path ${zipPath}`)
     program.error('')
   }
 
@@ -25,7 +25,7 @@ export async function decryptZip(zipPath: string, ivsessionKey: string, options:
   const { extConfig } = config.app
 
   if (!options.key && !existsSync(baseKey) && !extConfig.plugins?.CapacitorUpdater?.privateKey) {
-    p.log.error(`Private Key not found at the path ${baseKey} or in ${config.app.extConfigFilePath}`)
+    log.error(`Private Key not found at the path ${baseKey} or in ${config.apextConfigFilePath}`)
     program.error('')
   }
   const keyPath = options.key || baseKey
@@ -34,7 +34,7 @@ export async function decryptZip(zipPath: string, ivsessionKey: string, options:
   let privateKey = extConfig?.plugins?.CapacitorUpdater?.privateKey
 
   if (!existsSync(keyPath) && !privateKey) {
-    p.log.error(`Cannot find public key ${keyPath} or as keyData option or in ${config.app.extConfigFilePath}`)
+    log.error(`Cannot find public key ${keyPath} or as keyData option or in ${config.apextConfigFilePath}`)
     program.error('')
   }
   else if (existsSync(keyPath)) {
@@ -49,6 +49,6 @@ export async function decryptZip(zipPath: string, ivsessionKey: string, options:
   const decodedZip = decryptSource(zipFile, ivsessionKey, options.keyData ?? privateKey ?? '')
   // write decodedZip in a file
   writeFileSync(`${zipPath}_decrypted.zip`, decodedZip)
-  p.outro(`Decrypted zip file at ${zipPath}_decrypted.zip`)
-  process.exit()
+  outro(`Decrypted zip file at ${zipPath}_decrypted.zip`)
+  exit()
 }

package/src/bundle/delete.ts

@@ -1,6 +1,6 @@
-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 { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import type { OptionsBase } from '../utils'
 import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils'
@@ -11,17 +11,17 @@ interface Options extends OptionsBase {
 }
 
 export async function deleteBundle(bundleId: string, appId: string, options: Options) {
-  p.intro(`Delete bundle`)
+  intro(`Delete bundle`)
   options.apikey = options.apikey || findSavedKey()
-  const config = await getConfig()
-  appId = appId || config?.app?.appId
+  const extConfig = await getConfig()
+  appId = appId || extConfig?.config?.appId
 
   if (!options.apikey) {
-    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('')
   }
   if (!appId) {
-    p.log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
+    log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
     program.error('')
   }
   const supabase = await createSupabaseClient(options.apikey)
@@ -30,24 +30,23 @@ export async function deleteBundle(bundleId: string, appId: string, options: Opt
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.write)
 
-  appId = appId || config?.app?.appId
   if (!options.apikey) {
-    p.log.error('Missing API key, you need to provide an API key to delete your app')
+    log.error('Missing API key, you need to provide an API key to delete your app')
     program.error('')
   }
   if (!bundleId) {
-    p.log.error('Missing argument, you need to provide a bundleId, or be in a capacitor project')
+    log.error('Missing argument, you need to provide a bundleId, or be in a capacitor project')
     program.error('')
   }
   if (!appId) {
-    p.log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
+    log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
     program.error('')
   }
 
-  p.log.info(`Deleting bundle ${appId}@${bundleId} from Capgo`)
+  log.info(`Deleting bundle ${appId}@${bundleId} from Capgo`)
 
   await deleteSpecificVersion(supabase, appId, bundleId)
-  p.log.success(`Bundle ${appId}@${bundleId} deleted in Capgo`)
-  p.outro(`Done`)
-  process.exit()
+  log.success(`Bundle ${appId}@${bundleId} deleted in Capgo`)
+  outro(`Done`)
+  exit()
 }

package/src/bundle/encrypt.ts

@@ -1,8 +1,8 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs'
-import process from 'node:process'
+import { exit } from 'node:process'
 import { program } from 'commander'
 import ciDetect from 'ci-info'
-import * as p from '@clack/prompts'
+import { intro, log, outro } from '@clack/prompts'
 import { checkLatest } from '../api/update'
 import { encryptSource } from '../api/crypto'
 import { baseKeyPub, getLocalConfig } from '../utils'
@@ -13,7 +13,7 @@ interface Options {
 }
 
 export async function encryptZip(zipPath: string, options: Options) {
-  p.intro(`Encryption`)
+  intro(`Encryption`)
 
   await checkLatest()
   const localConfig = await getLocalConfig()
@@ -21,7 +21,7 @@ export async function encryptZip(zipPath: string, options: Options) {
   // write in file .capgo the apikey in home directory
 
   if (!existsSync(zipPath)) {
-    p.log.error(`Error: Zip not found at the path ${zipPath}`)
+    log.error(`Error: Zip not found at the path ${zipPath}`)
     program.error('')
   }
 
@@ -31,14 +31,14 @@ export async function encryptZip(zipPath: string, options: Options) {
   let publicKey = options.keyData || ''
 
   if (!existsSync(keyPath) && !publicKey) {
-    p.log.warning(`Cannot find public key ${keyPath} or as keyData option`)
+    log.warning(`Cannot find public key ${keyPath} or as keyData option`)
     if (ciDetect.isCI) {
-      p.log.error(`Error: Missing public key`)
+      log.error(`Error: Missing public key`)
       program.error('')
     }
-    const res = await p.confirm({ message: 'Do you want to use our public key ?' })
+    const res = await confirm({ message: 'Do you want to use our public key ?' })
     if (!res) {
-      p.log.error(`Error: Missing public key`)
+      log.error(`Error: Missing public key`)
       program.error('')
     }
     publicKey = localConfig.signKey || ''
@@ -51,10 +51,10 @@ export async function encryptZip(zipPath: string, options: Options) {
 
   const zipFile = readFileSync(zipPath)
   const encodedZip = encryptSource(zipFile, publicKey)
-  p.log.success(`ivSessionKey: ${encodedZip.ivSessionKey}`)
+  log.success(`ivSessionKey: ${encodedZiivSessionKey}`)
   // write decodedZip in a file
-  writeFileSync(`${zipPath}_encrypted.zip`, encodedZip.encryptedData)
-  p.log.success(`Encrypted zip saved at ${zipPath}_encrypted.zip`)
-  p.outro(`Done ✅`)
-  process.exit()
+  writeFileSync(`${zipPath}_encrypted.zip`, encodedZiencryptedData)
+  log.success(`Encrypted zip saved at ${zipPath}_encrypted.zip`)
+  outro(`Done ✅`)
+  exit()
 }

package/src/bundle/list.ts

@@ -1,6 +1,6 @@
-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 { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { displayBundles, getActiveAppVersions } from '../api/versions'
 import type { OptionsBase } from '../utils'
@@ -8,18 +8,17 @@ import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, verify
 import { checkLatest } from '../api/update'
 
 export async function listBundle(appId: string, options: OptionsBase) {
-  p.intro(`List bundles`)
+  intro(`List bundles`)
   await checkLatest()
   options.apikey = options.apikey || findSavedKey()
-  const config = await getConfig()
-
-  appId = appId || config?.app?.appId
+  const extConfig = await getConfig()
+  appId = appId || extConfig?.config?.appId
   if (!options.apikey) {
-    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('')
   }
   if (!appId) {
-    p.log.error('Missing argument, you need to provide a appid, or be in a capacitor project')
+    log.error('Missing argument, you need to provide a appid, or be in a capacitor project')
     program.error('')
   }
 
@@ -27,7 +26,7 @@ export async function listBundle(appId: string, options: OptionsBase) {
 
   await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload'])
 
-  p.log.info(`Querying available versions of: ${appId} in Capgo`)
+  log.info(`Querying available versions of: ${appId} in Capgo`)
 
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.read)
@@ -35,9 +34,9 @@ export async function listBundle(appId: string, options: OptionsBase) {
   // Get all active app versions we might possibly be able to cleanup
   const allVersions = await getActiveAppVersions(supabase, appId)
 
-  p.log.info(`Active versions in Capgo: ${allVersions?.length}`)
+  log.info(`Active versions in Capgo: ${allVersions?.length}`)
 
   displayBundles(allVersions)
-  p.outro(`Done ✅`)
-  process.exit()
+  outro(`Done ✅`)
+  exit()
 }

package/src/bundle/unlink.ts

@@ -1,6 +1,6 @@
-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 { getVersionData } from '../api/versions'
 import { checkVersionNotUsedInDeviceOverride } from '../api/devices_override'
 import { checkVersionNotUsedInChannel } from '../api/channels'
@@ -16,6 +16,7 @@ import {
   formatError,
   getConfig,
   getOrganizationId,
+  readPackageJson,
   useLogSnag,
   verifyUser,
 } from '../utils'
@@ -25,25 +26,26 @@ interface Options extends OptionsBase {
 }
 
 export async function unlinkDevice(channel: string, appId: string, options: Options) {
-  p.intro(`Unlink bundle ${options.apikey}`)
+  intro(`Unlink bundle ${options.apikey}`)
   options.apikey = options.apikey || findSavedKey()
-  const config = await getConfig()
-  appId = appId || config?.app?.appId
+  const extConfig = await getConfig()
+  appId = appId || extConfig?.config?.appId
   const snag = useLogSnag()
   let { bundle } = options
 
-  bundle = bundle || config?.app?.package?.version
+  const pack = await readPackageJson()
+  bundle = bundle || pack?.version
 
   if (!options.apikey) {
-    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('')
   }
   if (!appId) {
-    p.log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
+    log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
     program.error('')
   }
   if (!bundle) {
-    p.log.error('Missing argument, you need to provide a bundle, or be in a capacitor project')
+    log.error('Missing argument, you need to provide a bundle, or be in a capacitor project')
     program.error('')
   }
   const supabase = await createSupabaseClient(options.apikey)
@@ -57,7 +59,7 @@ export async function unlinkDevice(channel: string, appId: string, options: Opti
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.write)
 
   if (!channel) {
-    p.log.error('Missing argument, you need to provide a channel')
+    log.error('Missing argument, you need to provide a channel')
     program.error('')
   }
   try {
@@ -78,9 +80,9 @@ export async function unlinkDevice(channel: string, appId: string, options: Opti
     }).catch()
   }
   catch (err) {
-    p.log.error(`Unknow error ${formatError(err)}`)
+    log.error(`Unknow error ${formatError(err)}`)
     program.error('')
   }
-  p.outro('Done ✅')
-  process.exit()
+  outro('Done ✅')
+  exit()
 }