@capgo/cli 4.12.12 → 4.12.14-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.12.12",
+  "version": "4.12.14-beta.0",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",
@@ -32,42 +32,25 @@
     "node": ">=18.0.0"
   },
   "scripts": {
-    "build": "node build.mjs",
-    "dev": "NODE_ENV=development node build.mjs",
+    "build": "ncc build",
+    "dev": "NODE_ENV=development ncc build",
     "no-debug": "node dist/index.js",
     "test": "npx --yes ts-node -T src/index.ts",
-    "dev-build": "SUPA_DB=development node build.mjs",
+    "dev-build": "SUPA_DB=development ncc build",
     "pack": "pkg",
     "types": "npx --yes supabase gen types typescript --project-id=xvwzpoazmxkqosrdewyv > src/types/supabase.types.ts",
     "test_rls": "ts-node ./test/test_headers_rls.ts",
     "lint": "eslint \"src/**/*.ts\" --fix",
     "check-posix-paths": "node test/check-posix-paths.js"
   },
-  "dependencies": {
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@capacitor/cli": "6.1.0",
+  "devDependencies": {
+    "@antfu/eslint-config": "^2.21.1",
+    "@bradenmacdonald/s3-lite-client": "npm:@jsr/bradenmacdonald__s3-lite-client",
     "@capgo/find-package-manager": "^0.0.17",
     "@clack/prompts": "^0.7.0",
     "@manypkg/find-root": "^2.2.1",
     "@supabase/supabase-js": "^2.43.5",
     "@tomasklaen/checksum": "^1.1.0",
-    "adm-zip": "^0.5.14",
-    "ci-info": "^4.0.0",
-    "commander": "12.1.0",
-    "console-table-printer": "^2.12.1",
-    "get-latest-version": "^5.1.0",
-    "is-wsl": "^3.1.0",
-    "jszip": "^3.10.1",
-    "ky": "^1.3.0",
-    "logsnag": "1.0.0",
-    "mime": "^4.0.3",
-    "open": "^10.1.0",
-    "prettyjson": "^1.2.5",
-    "semver": "^7.6.2",
-    "tmp": "^0.2.3"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "^2.21.1",
     "@types/adm-zip": "0.5.5",
     "@types/mime": "^4.0.0",
     "@types/node": "^20.14.7",
@@ -78,11 +61,26 @@
     "@types/tmp": "^0.2.6",
     "@typescript-eslint/eslint-plugin": "^7.13.0",
     "@typescript-eslint/parser": "^7.13.1",
+    "@vercel/ncc": "^0.38.1",
+    "adm-zip": "^0.5.14",
+    "ci-info": "^4.0.0",
+    "commander": "12.1.0",
+    "console-table-printer": "^2.12.1",
     "esbuild": "^0.21.5",
     "eslint": "9.7.0",
+    "get-latest-version": "^5.1.0",
     "git-format-staged": "3.1.1",
     "husky": "^9.0.11",
+    "is-wsl": "^3.1.0",
+    "jszip": "^3.10.1",
+    "ky": "^1.3.0",
+    "logsnag": "1.0.0",
+    "mime": "^4.0.3",
+    "open": "^10.1.0",
     "pkg": "5.8.1",
+    "prettyjson": "^1.2.5",
+    "semver": "^7.6.2",
+    "tmp": "^0.2.3",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "4.2.0",

package/src/api/app.ts

@@ -1,6 +1,6 @@
 import type { SupabaseClient } from '@supabase/supabase-js'
-import * as p from '@clack/prompts'
 import { program } from 'commander'
+import { log } from '@clack/prompts'
 import type { Database } from '../types/supabase.types'
 import type { OptionsBase } from '../utils'
 import { OrganizationPerm, getPMAndCommand, isAllowedAppOrg } from '../utils'
@@ -18,17 +18,17 @@ export async function checkAppExistsAndHasPermissionOrgErr(supabase: SupabaseCli
   if (!permissions.okay) {
     switch (permissions.error) {
       case 'INVALID_APIKEY': {
-        p.log.error('Invalid apikey, such apikey does not exists!')
+        log.error('Invalid apikey, such apikey does not exists!')
         program.error('')
         break
       }
       case 'NO_APP': {
-        p.log.error(`App ${appid} does not exist, run first \`${pm.runner} @capgo/cli app add ${appid}\` to create it`)
+        log.error(`App ${appid} does not exist, run first \`${pm.runner} @capgo/cli app add ${appid}\` to create it`)
         program.error('')
         break
       }
       case 'NO_ORG': {
-        p.log.error('Could not find organization, please contact support to resolve this!')
+        log.error('Could not find organization, please contact support to resolve this!')
         program.error('')
         break
       }
@@ -39,7 +39,7 @@ export async function checkAppExistsAndHasPermissionOrgErr(supabase: SupabaseCli
   const requiredPermNumber = requiredPermission as number
 
   if (requiredPermNumber > remotePermNumber) {
-    p.log.error(`Insuficcent permissions for app ${appid}. Current permission: ${OrganizationPerm[permissions.data]}, required for this action: ${OrganizationPerm[requiredPermission]}.`)
+    log.error(`Insuficcent permissions for app ${appid}. Current permission: ${OrganizationPerm[permissions.data]}, required for this action: ${OrganizationPerm[requiredPermission]}.`)
     program.error('')
   }
 

package/src/api/channels.ts

@@ -1,8 +1,8 @@
-import process from 'node:process'
+import { exit } from 'node:process'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { program } from 'commander'
 import { Table } from 'console-table-printer'
-import * as p from '@clack/prompts'
+import { confirm as confirmC, intro, log, outro, spinner } from '@clack/prompts'
 import type { Database } from '../types/supabase.types'
 import { formatError } from '../utils'
 
@@ -13,15 +13,15 @@ export async function checkVersionNotUsedInChannel(supabase: SupabaseClient<Data
     .eq('app_id', appid)
     .eq('version', versionData.id)
   if (errorChannel) {
-    p.log.error(`Cannot check Version ${appid}@${versionData.name}`)
+    log.error(`Cannot check Version ${appid}@${versionData.name}`)
     program.error('')
   }
   if (channelFound && channelFound.length > 0) {
-    p.intro(`❌ Version ${appid}@${versionData.name} is used in ${channelFound.length} channel`)
-    if (await p.confirm({ message: 'unlink it?' })) {
+    intro(`❌ Version ${appid}@${versionData.name} is used in ${channelFound.length} channel`)
+    if (await confirmC({ message: 'unlink it?' })) {
       // loop on all channels and set version to unknown
       for (const channel of channelFound) {
-        const s = p.spinner()
+        const s = spinner()
         s.start(`Unlinking channel ${channel.name}`)
         const { error: errorChannelUpdate } = await supabase
           .from('channels')
@@ -31,16 +31,16 @@ export async function checkVersionNotUsedInChannel(supabase: SupabaseClient<Data
           .eq('id', channel.id)
         if (errorChannelUpdate) {
           s.stop(`Cannot update channel ${channel.name} ${formatError(errorChannelUpdate)}`)
-          process.exit(1)
+          exit(1)
         }
         s.stop(`✅ Channel ${channel.name} unlinked`)
       }
     }
     else {
-      p.log.error(`Unlink it first`)
+      log.error(`Unlink it first`)
       program.error('')
     }
-    p.outro(`Version unlinked from ${channelFound.length} channel`)
+    outro(`Version unlinked from ${channelFound.length} channel`)
   }
 }
 
@@ -53,7 +53,7 @@ export function findUnknownVersion(supabase: SupabaseClient<Database>, appId: st
     .throwOnError()
     .single().then(({ data, error }) => {
       if (error) {
-        p.log.error(`Cannot call findUnknownVersion as it returned an error.\n${formatError(error)}`)
+        log.error(`Cannot call findUnknownVersion as it returned an error.\n${formatError(error)}`)
         program.error('')
       }
       return data
@@ -125,7 +125,7 @@ export function displayChannels(data: Channel[]) {
     })
   })
 
-  p.log.success(t.render())
+  log.success(t.render())
 }
 
 export async function getActiveChannels(supabase: SupabaseClient<Database>, appid: string) {
@@ -156,7 +156,7 @@ export async function getActiveChannels(supabase: SupabaseClient<Database>, appi
     .order('created_at', { ascending: false })
 
   if (vError) {
-    p.log.error(`App ${appid} not found in database`)
+    log.error(`App ${appid} not found in database`)
     program.error('')
   }
   return data as any as Channel[]

package/src/api/devices_override.ts

@@ -1,7 +1,7 @@
-import process from 'node:process'
+import { exit } from 'node:process'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { program } from 'commander'
-import * as p from '@clack/prompts'
+import { confirm as confirmC, intro, log, spinner } from '@clack/prompts'
 import type { Database } from '../types/supabase.types'
 import { formatError } from '../utils'
 
@@ -12,15 +12,15 @@ export async function checkVersionNotUsedInDeviceOverride(supabase: SupabaseClie
     .eq('app_id', appid)
     .eq('version', versionData.id)
   if (errorDevice) {
-    p.log.error(`Cannot check Device override ${appid}@${versionData.name}`)
+    log.error(`Cannot check Device override ${appid}@${versionData.name}`)
     program.error('')
   }
   if (deviceFound && deviceFound.length > 0) {
-    p.intro(`❌ Version ${appid}@${versionData.name} is used in ${deviceFound.length} device override`)
-    if (await p.confirm({ message: 'unlink it?' })) {
+    intro(`❌ Version ${appid}@${versionData.name} is used in ${deviceFound.length} device override`)
+    if (await confirmC({ message: 'unlink it?' })) {
       // loop on all devices and set version to unknown
       for (const device of deviceFound) {
-        const s = p.spinner()
+        const s = spinner()
         s.start(`Unlinking device ${device.device_id}`)
         const { error: errorDeviceDel } = await supabase
           .from('devices_override')
@@ -28,13 +28,13 @@ export async function checkVersionNotUsedInDeviceOverride(supabase: SupabaseClie
           .eq('device_id', device.device_id)
         if (errorDeviceDel) {
           s.stop(`Cannot unlink device ${device.device_id} ${formatError(errorDeviceDel)}`)
-          process.exit(1)
+          exit(1)
         }
         s.stop(`✅ Device ${device.device_id} unlinked`)
       }
     }
     else {
-      p.log.error(`Unlink it first`)
+      log.error(`Unlink it first`)
       program.error('')
     }
   }

package/src/api/update.ts

@@ -1,12 +1,12 @@
 import getLatest from 'get-latest-version'
-import * as p from '@clack/prompts'
+import { log } from '@clack/prompts'
 import pack from '../../package.json'
 
 export async function checkLatest() {
   const latest = await getLatest('@capgo/cli')
   const major = latest?.split('.')[0]
   if (latest !== pack.version) {
-    p.log.warning(`🚨 You are using @capgo/cli@${pack.version} it's not the latest version.
+    log.warning(`🚨 You are using @capgo/cli@${pack.version} it's not the latest version.
 Please use @capgo/cli@${latest}" or @capgo/cli@${major} to keep up to date with the latest features and bug fixes.`,
     )
   }

package/src/api/versions.ts

@@ -1,7 +1,8 @@
+import { exit } from 'node:process'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import { program } from 'commander'
 import { Table } from 'console-table-printer'
-import * as p from '@clack/prompts'
+import { log } from '@clack/prompts'
 import type { Database } from '../types/supabase.types'
 
 // import { definitions } from '../types/types_supabase';
@@ -19,7 +20,7 @@ export async function deleteAppVersion(supabase: SupabaseClient<Database>, appid
     .eq('deleted', false)
     .eq('name', bundle)
   if (delAppSpecVersionError) {
-    p.log.error(`App Version ${appid}@${bundle} not found in database`)
+    log.error(`App Version ${appid}@${bundle} not found in database`)
     program.error('')
   }
 }
@@ -34,9 +35,9 @@ export async function deleteSpecificVersion(supabase: SupabaseClient<Database>,
 
 export function displayBundles(data: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[]) {
   if (!data.length) {
-    p.log.error('No bundle found')
-    // eslint-disable-next-line node/prefer-global/process
-    process.exit(1)
+    log.error('No bundle found')
+
+    exit(1)
   }
   const t = new Table({
     title: 'Bundles',
@@ -52,7 +53,7 @@ export function displayBundles(data: (Database['public']['Tables']['app_versions
     })
   })
 
-  p.log.success(t.render())
+  log.success(t.render())
 }
 
 export async function getActiveAppVersions(supabase: SupabaseClient<Database>, appid: string) {
@@ -64,7 +65,7 @@ export async function getActiveAppVersions(supabase: SupabaseClient<Database>, a
     .order('created_at', { ascending: false })
 
   if (vError) {
-    p.log.error(`App ${appid} not found in database`)
+    log.error(`App ${appid} not found in database`)
     program.error('')
   }
   return data
@@ -78,7 +79,7 @@ export async function getChannelsVersion(supabase: SupabaseClient<Database>, app
     .eq('app_id', appid)
 
   if (channelsError) {
-    p.log.error(`App ${appid} not found in database`)
+    log.error(`App ${appid} not found in database`)
     program.error('')
   }
   return channels.map(c => c.version)
@@ -93,7 +94,7 @@ export async function getVersionData(supabase: SupabaseClient<Database>, appid:
     .eq('deleted', false)
     .single()
   if (!versionData || versionIdError) {
-    p.log.error(`App Version ${appid}@${bundle} doesn't exist`)
+    log.error(`App Version ${appid}@${bundle} doesn't exist`)
     program.error('')
   }
   return versionData

package/src/app/add.ts

@@ -1,8 +1,8 @@
 import { existsSync, readFileSync } from 'node:fs'
-import process from 'node:process'
+import { config, exit } from 'node:process'
 import mime from 'mime'
 import { program } from 'commander'
-import * as p from '@clack/prompts'
+import { intro, log, outro } from '@clack/prompts'
 import { checkLatest } from '../api/update'
 import type { Options } from '../api/app'
 import { checkAppExists, newIconPath } from '../api/app'
@@ -25,24 +25,24 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
 
 export async function addAppInternal(appId: string, options: Options, organization?: Organization, throwErr = true) {
   if (throwErr)
-    p.intro(`Adding`)
+    intro(`Adding`)
 
   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('')
   }
 
   if (appId.includes('--')) {
-    p.log.error('The app id includes illegal symbols. You cannot use "--" in the app id')
+    log.error('The app id includes illegal symbols. You cannot use "--" in the app id')
     program.error('')
   }
 
@@ -53,7 +53,7 @@ export async function addAppInternal(appId: string, options: Options, organizati
   // Check we have app access to this appId
   const appExist = await checkAppExists(supabase, appId)
   if (appExist) {
-    p.log.error(`App ${appId} already exist`)
+    log.error(`App ${appId} already exist`)
     program.error('')
   }
 
@@ -65,15 +65,14 @@ export async function addAppInternal(appId: string, options: Options, organizati
   await checkPlanValid(supabase, organizationUid, options.apikey, undefined, false)
 
   let { name, icon } = options
-  appId = appId || config?.app?.appId
-  name = name || config?.app?.appName || 'Unknown'
+  name = name || extConfig.config?.appName || 'Unknown'
   icon = icon || 'resources/icon.png' // default path for capacitor app
   if (!icon || !name) {
-    p.log.error('Missing argument, you need to provide a appId and a name, or be in a capacitor project')
+    log.error('Missing argument, you need to provide a appId and a name, or be in a capacitor project')
     program.error('')
   }
   if (throwErr)
-    p.log.info(`Adding ${appId} to Capgo`)
+    log.info(`Adding ${appId} to Capgo`)
 
   let iconBuff
   let iconType
@@ -82,16 +81,16 @@ export async function addAppInternal(appId: string, options: Options, organizati
     iconBuff = readFileSync(icon)
     const contentType = mime.getType(icon)
     iconType = contentType || 'image/png'
-    p.log.warn(`Found app icon ${icon}`)
+    log.warn(`Found app icon ${icon}`)
   }
   else if (existsSync(newIconPath)) {
     iconBuff = readFileSync(newIconPath)
     const contentType = mime.getType(newIconPath)
     iconType = contentType || 'image/png'
-    p.log.warn(`Found app icon ${newIconPath}`)
+    log.warn(`Found app icon ${newIconPath}`)
   }
   else {
-    p.log.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`)
+    log.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`)
   }
 
   const fileName = `icon`
@@ -106,7 +105,7 @@ export async function addAppInternal(appId: string, options: Options, organizati
       })
     if (error) {
       console.error(error)
-      p.log.error(`Could not add app ${formatError(error)}`)
+      log.error(`Could not add app ${formatError(error)}`)
       program.error('')
     }
     const { data: signedURLData } = await supabase
@@ -125,7 +124,7 @@ export async function addAppInternal(appId: string, options: Options, organizati
       app_id: appId,
     })
   if (dbError) {
-    p.log.error(`Could not add app ${formatError(dbError)}`)
+    log.error(`Could not add app ${formatError(dbError)}`)
     program.error('')
   }
   const { error: dbVersionError } = await supabase
@@ -142,13 +141,13 @@ export async function addAppInternal(appId: string, options: Options, organizati
       app_id: appId,
     }])
   if (dbVersionError) {
-    p.log.error(`Could not add app ${formatError(dbVersionError)}`)
+    log.error(`Could not add app ${formatError(dbVersionError)}`)
     program.error('')
   }
-  p.log.success(`App ${appId} added to Capgo. ${throwErr ? 'You can upload a bundle now' : ''}`)
+  log.success(`App ${appId} added to Capgo. ${throwErr ? 'You can upload a bundle now' : ''}`)
   if (throwErr) {
-    p.outro(`Done ✅`)
-    process.exit()
+    outro(`Done ✅`)
+    exit()
   }
   return true
 }