@capgo/cli 4.12.12 → 4.12.14-beta.0

package/src/channel/currentBundle.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 } from '@clack/prompts'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import type { OptionsBase } from '../utils'
 import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils'
@@ -20,18 +20,18 @@ export async function currentBundle(channel: string, appId: string, options: Opt
   const { quiet } = options
 
   if (!quiet)
-    p.intro(`List current bundle`)
+    intro(`List current bundle`)
 
   options.apikey = options.apikey || findSavedKey(quiet)
-  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)
@@ -41,7 +41,7 @@ export async function currentBundle(channel: string, appId: string, options: Opt
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.read)
 
   if (!channel) {
-    p.log.error(`Please provide a channel to get the bundle from.`)
+    log.error(`Please provide a channel to get the bundle from.`)
     program.error('')
   }
 
@@ -53,20 +53,20 @@ export async function currentBundle(channel: string, appId: string, options: Opt
     .limit(1)
 
   if (error || supabaseChannel.length === 0) {
-    p.log.error(`Error retrieving channel ${channel} for app ${appId}. Perhaps the channel does not exists?`)
+    log.error(`Error retrieving channel ${channel} for app ${appId}. Perhaps the channel does not exists?`)
     program.error('')
   }
 
   const { version } = supabaseChannel[0] as any as Channel
   if (!version) {
-    p.log.error(`Error retrieving channel ${channel} for app ${appId}. Perhaps the channel does not exists?`)
+    log.error(`Error retrieving channel ${channel} for app ${appId}. Perhaps the channel does not exists?`)
     program.error('')
   }
 
   if (!quiet)
-    p.log.info(`Current bundle for channel ${channel} is ${version.name}`)
+    log.info(`Current bundle for channel ${channel} is ${version.name}`)
   else
-    p.log.info(version.name)
+    log.info(version.name)
 
-  process.exit()
+  exit()
 }

package/src/channel/delete.ts

@@ -1,24 +1,24 @@
-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 { delChannel } from '../api/channels'
 import type { OptionsBase } from '../utils'
 import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 export async function deleteChannel(channelId: string, appId: string, options: OptionsBase) {
-  p.intro(`Delete channel`)
+  intro(`Delete channel`)
   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()
 
   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)
@@ -27,15 +27,15 @@ export async function deleteChannel(channelId: string, appId: string, options: O
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.admin)
 
-  p.log.info(`Deleting channel ${appId}#${channelId} from Capgo`)
+  log.info(`Deleting channel ${appId}#${channelId} from Capgo`)
   try {
     const deleteStatus = await delChannel(supabase, channelId, appId, userId)
     if (deleteStatus.error) {
-      p.log.error(`Cannot delete Channel 🙀 ${formatError(deleteStatus.error)}`)
+      log.error(`Cannot delete Channel 🙀 ${formatError(deleteStatus.error)}`)
       program.error('')
     }
     const orgId = await getOrganizationId(supabase, appId)
-    p.log.success(`Channel deleted`)
+    log.success(`Channel deleted`)
     await snag.track({
       channel: 'channel',
       event: 'Delete channel',
@@ -50,8 +50,8 @@ export async function deleteChannel(channelId: string, appId: string, options: O
     }).catch()
   }
   catch (error) {
-    p.log.error(`Cannot delete Channel 🙀`)
+    log.error(`Cannot delete Channel 🙀`)
   }
-  p.outro(`Done ✅`)
-  process.exit()
+  outro(`Done ✅`)
+  exit()
 }

package/src/channel/list.ts

@@ -1,23 +1,23 @@
-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 { displayChannels, getActiveChannels } from '../api/channels'
 import type { OptionsBase } from '../utils'
 import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
 
 export async function listChannels(appId: string, options: OptionsBase) {
-  p.intro(`List channels`)
+  intro(`List channels`)
   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()
 
   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')
 
   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)
@@ -26,12 +26,12 @@ export async function listChannels(appId: string, options: OptionsBase) {
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.read)
 
-  p.log.info(`Querying available channels in Capgo`)
+  log.info(`Querying available channels in Capgo`)
 
   // Get all active app versions we might possibly be able to cleanup
   const allVersions = await getActiveChannels(supabase, appId)
 
-  p.log.info(`Active channels in Capgo: ${allVersions?.length}`)
+  log.info(`Active channels in Capgo: ${allVersions?.length}`)
 
   displayChannels(allVersions)
   await snag.track({
@@ -44,6 +44,6 @@ export async function listChannels(appId: string, options: OptionsBase) {
     },
     notify: false,
   }).catch()
-  p.outro(`Done ✅`)
-  process.exit()
+  outro(`Done ✅`)
+  exit()
 }

package/src/channel/set.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 type { Database } from '../types/supabase.types'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import type {
@@ -14,6 +14,7 @@ import {
   formatError,
   getConfig,
   getOrganizationId,
+  readPackageJson,
   updateOrCreateChannel,
   useLogSnag,
   verifyUser,
@@ -36,18 +37,18 @@ interface Options extends OptionsBase {
 const disableAutoUpdatesPossibleOptions = ['major', 'minor', 'metadata', 'patch', 'none']
 
 export async function setChannel(channel: string, appId: string, options: Options) {
-  p.intro(`Set channel`)
+  intro(`Set channel`)
   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()
 
   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)
@@ -59,11 +60,11 @@ export async function setChannel(channel: string, appId: string, options: Option
 
   const { bundle, state, downgrade, latest, upgrade, ios, android, selfAssign, disableAutoUpdate, dev, emulator } = 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 (latest && bundle) {
-    p.log.error('Cannot set latest and bundle at the same time')
+    log.error('Cannot set latest and bundle at the same time')
     program.error('')
   }
   if (bundle == null
@@ -77,7 +78,7 @@ export async function setChannel(channel: string, appId: string, options: Option
     && dev == null
     && emulator == null
     && disableAutoUpdate == null) {
-    p.log.error('Missing argument, you need to provide a option to set')
+    log.error('Missing argument, you need to provide a option to set')
     program.error('')
   }
   try {
@@ -89,7 +90,8 @@ export async function setChannel(channel: string, appId: string, options: Option
       owner_org: orgId,
       version: undefined as any,
     }
-    const bundleVersion = latest ? config?.app?.package?.version : bundle
+    const pack = await readPackageJson()
+    const bundleVersion = latest ? pack?.version : bundle
     if (bundleVersion != null) {
       const { data, error: vError } = await supabase
         .from('app_versions')
@@ -100,33 +102,33 @@ export async function setChannel(channel: string, appId: string, options: Option
         .eq('deleted', false)
         .single()
       if (vError || !data) {
-        p.log.error(`Cannot find version ${bundleVersion}`)
+        log.error(`Cannot find version ${bundleVersion}`)
         program.error('')
       }
-      p.log.info(`Set ${appId} channel: ${channel} to @${bundleVersion}`)
+      log.info(`Set ${appId} channel: ${channel} to @${bundleVersion}`)
       channelPayload.version = data.id
     }
     if (state != null) {
       if (state === 'public' || state === 'private')
-        p.log.info(`Set ${appId} channel: ${channel} to public or private is deprecated, use default or normal instead`)
+        log.info(`Set ${appId} channel: ${channel} to public or private is deprecated, use default or normal instead`)
 
-      p.log.info(`Set ${appId} channel: ${channel} to ${state === 'public' || state === 'default' ? 'default' : 'normal'}`)
+      log.info(`Set ${appId} channel: ${channel} to ${state === 'public' || state === 'default' ? 'default' : 'normal'}`)
       channelPayload.public = state === 'public' || state === 'default'
     }
     if (downgrade != null) {
-      p.log.info(`Set ${appId} channel: ${channel} to ${downgrade ? 'allow' : 'disallow'} downgrade`)
+      log.info(`Set ${appId} channel: ${channel} to ${downgrade ? 'allow' : 'disallow'} downgrade`)
       channelPayload.disableAutoUpdateUnderNative = !downgrade
     }
     if (ios != null) {
-      p.log.info(`Set ${appId} channel: ${channel} to ${ios ? 'allow' : 'disallow'} ios update`)
+      log.info(`Set ${appId} channel: ${channel} to ${ios ? 'allow' : 'disallow'} ios update`)
       channelPayload.ios = !!ios
     }
     if (android != null) {
-      p.log.info(`Set ${appId} channel: ${channel} to ${android ? 'allow' : 'disallow'} android update`)
+      log.info(`Set ${appId} channel: ${channel} to ${android ? 'allow' : 'disallow'} android update`)
       channelPayload.android = !!android
     }
     if (selfAssign != null) {
-      p.log.info(`Set ${appId} channel: ${channel} to ${selfAssign ? 'allow' : 'disallow'} self assign to this channel`)
+      log.info(`Set ${appId} channel: ${channel} to ${selfAssign ? 'allow' : 'disallow'} self assign to this channel`)
       channelPayload.allow_device_self_set = !!selfAssign
     }
     if (disableAutoUpdate != null) {
@@ -134,7 +136,7 @@ export async function setChannel(channel: string, appId: string, options: Option
 
       // The user passed an unimplemented strategy
       if (!disableAutoUpdatesPossibleOptions.includes(finalDisableAutoUpdate)) {
-        p.log.error(`Channel strategy ${finalDisableAutoUpdate} is not known. The possible values are: ${disableAutoUpdatesPossibleOptions.join(', ')}.`)
+        log.error(`Channel strategy ${finalDisableAutoUpdate} is not known. The possible values are: ${disableAutoUpdatesPossibleOptions.join(', ')}.`)
         program.error('')
       }
 
@@ -144,17 +146,17 @@ export async function setChannel(channel: string, appId: string, options: Option
 
       // This cast is safe, look above
       channelPayload.disableAutoUpdate = finalDisableAutoUpdate as any
-      p.log.info(`Set ${appId} channel: ${channel} to ${finalDisableAutoUpdate} disable update strategy to this channel`)
+      log.info(`Set ${appId} channel: ${channel} to ${finalDisableAutoUpdate} disable update strategy to this channel`)
     }
     try {
       const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload)
       if (dbError) {
-        p.log.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`)
+        log.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`)
         program.error('')
       }
     }
     catch (e) {
-      p.log.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`)
+      log.error(`Cannot set channel the upload key is not allowed to do that, use the "all" for this.`)
       program.error('')
     }
     await snag.track({
@@ -169,9 +171,9 @@ export async function setChannel(channel: string, appId: string, options: Option
     }).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()
 }

package/src/config/index.ts

@@ -0,0 +1,156 @@
+import { resolve } from 'node:path'
+import { cwd } from 'node:process'
+import { accessSync, constants, readFileSync, writeFileSync } from 'node:fs'
+
+export const CONFIG_FILE_NAME_TS = 'capacitor.config.ts'
+export const CONFIG_FILE_NAME_JSON = 'capacitor.config.json'
+
+export interface CapacitorConfig {
+  appId: string
+  appName: string
+  webDir: string
+  plugins?: Record<string, any>
+  android?: Record<string, any>
+  [key: string]: any
+}
+
+interface ExtConfigPairs {
+  config: CapacitorConfig
+  path: string
+}
+
+function parseConfigObject(configString: string): CapacitorConfig {
+  // Remove comments
+  const noComments = configString.replace(/\/\/.*|\/\*[\s\S]*?\*\//g, '')
+
+  // Parse the object
+  // eslint-disable-next-line no-new-func
+  const configObject = Function(`return ${noComments.trim()}`)()
+
+  return configObject as CapacitorConfig
+}
+
+function loadConfigTs(content: string): CapacitorConfig {
+  const configRegex = /const\s+config\s*:\s*CapacitorConfig\s*=\s*(\{[\s\S]*?\n\})/
+  const match = content.match(configRegex)
+
+  if (!match) {
+    throw new Error('Unable to find config object in TypeScript file')
+  }
+
+  return parseConfigObject(match[1])
+}
+
+function loadConfigJson(content: string): CapacitorConfig {
+  return JSON.parse(content) as CapacitorConfig
+}
+
+export async function loadConfig(): Promise<ExtConfigPairs | undefined> {
+  const appRootDir = cwd()
+  const extConfigFilePathTS = resolve(appRootDir, CONFIG_FILE_NAME_TS)
+  const extConfigFilePathJSON = resolve(appRootDir, CONFIG_FILE_NAME_JSON)
+
+  try {
+    accessSync(extConfigFilePathTS, constants.R_OK)
+    const configContentTS = readFileSync(extConfigFilePathTS, 'utf-8')
+    return {
+      config: loadConfigTs(configContentTS),
+      path: extConfigFilePathTS,
+    }
+  }
+  catch (err) {
+    try {
+      accessSync(extConfigFilePathJSON, constants.R_OK)
+      const configContentJSON = readFileSync(extConfigFilePathJSON, 'utf-8')
+      return {
+        config: loadConfigJson(configContentJSON),
+        path: extConfigFilePathJSON,
+      }
+    }
+    catch (err) {
+      console.error('Cannot find capacitor.config.ts or capacitor.config.json')
+      return undefined
+    }
+  }
+}
+
+export async function writeConfig(config: ExtConfigPairs): Promise<void> {
+  const { config: newConfig, path } = config
+  const content = readFileSync(path, 'utf-8')
+
+  const updatedContent = path.endsWith('.json')
+    ? updateJsonContent(content, newConfig)
+    : updateTsContent(content, newConfig)
+
+  writeFileSync(path, updatedContent)
+}
+
+function updateJsonContent(content: string, newConfig: CapacitorConfig): string {
+  const jsonObj = JSON.parse(content)
+  if (!jsonObj.plugins)
+    jsonObj.plugins = {}
+  if (!jsonObj.plugins.CapacitorUpdater)
+    jsonObj.plugins.CapacitorUpdater = {}
+
+  Object.assign(jsonObj.plugins.CapacitorUpdater, newConfig.plugins?.CapacitorUpdater)
+
+  return JSON.stringify(jsonObj, null, detectIndentation(content))
+}
+
+function updateTsContent(content: string, newConfig: CapacitorConfig): string {
+  const capUpdaterRegex = /(\bCapacitorUpdater\s*:\s*\{[^}]*\})/g
+
+  return content.replace(capUpdaterRegex, (match) => {
+    const updatedSection = updateCapacitorUpdaterSection(match, newConfig.plugins?.CapacitorUpdater || {})
+    return updatedSection
+  })
+}
+
+function updateCapacitorUpdaterSection(section: string, newConfig: Record<string, any>): string {
+  const lines = section.split('\n')
+  const updatedLines = lines.map((line) => {
+    // eslint-disable-next-line regexp/no-super-linear-backtracking
+    const keyValueMatch = line.match(/^\s*(\w+)\s*:\s*(.+?),?\s*$/)
+    if (keyValueMatch) {
+      const [, key] = keyValueMatch
+      if (key in newConfig) {
+        const newValue = formatValue(newConfig[key])
+        return line.replace(/:\s*.+/, `: ${newValue},`)
+      }
+    }
+    return line
+  })
+
+  // Add new properties
+  Object.entries(newConfig).forEach(([key, value]) => {
+    if (!updatedLines.some(line => line.includes(`${key}:`))) {
+      const indent = detectIndentation(section)
+      updatedLines.splice(-1, 0, `${' '.repeat(indent)}${key}: ${formatValue(value)},`)
+    }
+  })
+
+  return updatedLines.join('\n')
+}
+
+function formatValue(value: any): string {
+  if (typeof value === 'string') {
+    // Convert multiline strings (like RSA keys) to single line
+    if (value.includes('\n')) {
+      return `'${value.replace(/\n/g, '\\n')}'`
+    }
+    return `'${value}'`
+  }
+  if (typeof value === 'number' || typeof value === 'boolean')
+    return String(value)
+  if (Array.isArray(value))
+    return `[${value.map(formatValue).join(', ')}]`
+  if (typeof value === 'object' && value !== null) {
+    return `{ ${Object.entries(value).map(([k, v]) => `${k}: ${formatValue(v)}`).join(', ')} }`
+  }
+  return 'null'
+}
+
+function detectIndentation(content: string): number {
+  const match = content.match(/^( +)/m)
+  return match ? match[1].length : 2
+}

package/src/index.ts

@@ -114,10 +114,13 @@ bundle
   .option('-c, --channel <channel>', 'channel to link to')
   .option('-e, --external <url>', 'link to external url intead of upload to Capgo Cloud')
   .option('--iv-session-key <key>', 'Set the iv and session key for bundle url external')
-  .option('--s3-region <region>', 'Region for your AWS S3 bucket')
-  .option('--s3-apikey <apikey>', 'apikey for your AWS S3 account')
-  .option('--s3-apisecret <apisecret>', 'api secret for your AWS S3 account')
+  .option('--s3-region <region>', 'Region for your S3 bucket')
+  .option('--s3-apikey <apikey>', 'Apikey for your S3 endpoint')
+  .option('--s3-apisecret <apisecret>', 'Api secret for your S3 endpoint')
+  .option('--s3-endoint <s3Endpoint>', 'Url of S3 endpoint')
   .option('--s3-bucket-name <bucketName>', 'Name for your AWS S3 bucket')
+  .option('--s3-port <port>', 'Port for your S3 endpoint')
+  .option('--no-s3-ssl', 'Disable SSL for S3 upload')
   .option('--key <key>', 'custom path for public signing key')
   .option('--key-data <keyData>', 'base64 public signing key')
   .option('--bundle-url', 'prints bundle url into stdout')