@capgo/cli 4.0.12 → 4.0.13

package/src/bundle/cleanup.ts

@@ -1,131 +1,128 @@
-import { program } from 'commander';
-import semver from 'semver/preload';
-import * as p from '@clack/prompts';
-import promptSync from 'prompt-sync';
-import { SupabaseClient } from '@supabase/supabase-js';
-import { Database } from '../types/supabase.types';
-import { OptionsBase, createSupabaseClient, findSavedKey, getConfig, getHumanDate, verifyUser } from '../utils';
-import { deleteSpecificVersion, displayBundles, getActiveAppVersions, getChannelsVersion } from '../api/versions';
-import { checkAppExistsAndHasPermissionErr } from '../api/app';
-import { checkLatest } from '../api/update';
-
+import process from 'node:process'
+import { program } from 'commander'
+import semver from 'semver/preload'
+import * as p from '@clack/prompts'
+import promptSync from 'prompt-sync'
+import type { SupabaseClient } from '@supabase/supabase-js'
+import type { Database } from '../types/supabase.types'
+import type { OptionsBase } from '../utils'
+import { createSupabaseClient, findSavedKey, getConfig, getHumanDate, verifyUser } from '../utils'
+import { deleteSpecificVersion, displayBundles, getActiveAppVersions, getChannelsVersion } from '../api/versions'
+import { checkAppExistsAndHasPermissionErr } from '../api/app'
+import { checkLatest } from '../api/update'
 
 interface Options extends OptionsBase {
-  version: string;
-  bundle: string;
-  keep: number;
-  force: boolean;
+  version: string
+  bundle: string
+  keep: number
+  force: boolean
 }
 
-const prompt = promptSync();
-
-const removeVersions = async (toRemove: Database['public']['Tables']['app_versions']['Row'][],
-  supabase: SupabaseClient<Database>, appid: string, userId: string) => {
+const prompt = promptSync()
 
+async function removeVersions(toRemove: Database['public']['Tables']['app_versions']['Row'][], supabase: SupabaseClient<Database>, appid: string, userId: 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))}`);
-    await deleteSpecificVersion(supabase, appid, userId, row.name);
+    p.log.warn(`Removing ${row.name} created on ${(getHumanDate(row.created_at))}`)
+    await deleteSpecificVersion(supabase, appid, userId, row.name)
   }
 }
 
-const getRemovableVersionsInSemverRange = (data: Database['public']['Tables']['app_versions']['Row'][],
-  bundle: string, nextMajor: string) => {
-  const toRemove: Database['public']['Tables']['app_versions']['Row'][] = [];
+function getRemovableVersionsInSemverRange(data: Database['public']['Tables']['app_versions']['Row'][], bundle: string, nextMajor: string) {
+  const toRemove: Database['public']['Tables']['app_versions']['Row'][] = []
 
-  data?.forEach(row => {
-    if (semver.gte(row.name, bundle) && semver.lt(row.name, `${nextMajor}`)) {
-      toRemove.push(row);
-    }
-  });
-  return toRemove;
+  data?.forEach((row) => {
+    if (semver.gte(row.name, bundle) && semver.lt(row.name, `${nextMajor}`))
+      toRemove.push(row)
+  })
+  return toRemove
 }
 
-export const cleanupBundle = async (appid: string, options: Options) => {
-  p.intro(`Cleanup versions in Capgo`);
-  await checkLatest();
+export async function cleanupBundle(appid: string, options: Options) {
+  p.intro(`Cleanup versions in Capgo`)
+  await checkLatest()
   options.apikey = options.apikey || findSavedKey()
-  const { bundle, keep = 4 } = options;
-  const force = options.force || false;
+  const { bundle, keep = 4 } = options
+  const force = options.force || false
 
-  const config = await getConfig();
+  const config = await getConfig()
   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');
-    program.error('');
+    p.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');
-    program.error('');
+    p.log.error('Missing argument, you need to provide a appid, or be in a capacitor project')
+    program.error('')
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey);
+  const userId = await verifyUser(supabase, options.apikey)
 
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid);
-  p.log.info(`Querying all available versions in Capgo`);
+  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid)
+  p.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, userId);
+  getActiveAppVersions(supabase, appid, userId)
 
-  const versionInUse = await getChannelsVersion(supabase, appid);
+  const versionInUse = await getChannelsVersion(supabase, appid)
 
-  p.log.info(`Total active versions in Capgo: ${allVersions?.length}`);
+  p.log.info(`Total active versions in Capgo: ${allVersions?.length}`)
   if (allVersions?.length === 0) {
-    p.log.error('No versions found, aborting cleanup');
-    return;
+    p.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}`);
+    const nextMajor = `${semver.inc(bundle, 'major')}`
+    p.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 })[];
+    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}`);
+    p.log.info(`Active versions in Capgo between ${bundle} and ${nextMajor}: ${allVersions?.length}`)
   }
 
   // Slice to keep and remove
 
   const toRemove: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[] = []
   // Slice to keep and remove
-  let kept = 0;
+  let kept = 0
   allVersions.forEach((v) => {
-    const isInUse = versionInUse.find((vi) => vi === v.id);
+    const isInUse = versionInUse.find(vi => vi === v.id)
     if (kept < keep || isInUse) {
-      if(isInUse) {
-        v.keep = '✅ (Linked to channel)';
-      } else {
-        v.keep = '✅';
-      }
-      kept += 1;
-    } else {
-      v.keep = '❌';
-      toRemove.push(v);
+      if (isInUse)
+        v.keep = '✅ (Linked to channel)'
+      else
+        v.keep = '✅'
+
+      kept += 1
+    }
+    else {
+      v.keep = '❌'
+      toRemove.push(v)
     }
   })
 
   if (toRemove.length === 0) {
-    p.log.warn("Nothing to be removed, aborting removal...")
-    return;
+    p.log.warn('Nothing to be removed, aborting removal...')
+    return
   }
-  displayBundles(allVersions);
+  displayBundles(allVersions)
 
   // Check user wants to clean that all up
   if (!force) {
-    const result = prompt("Do you want to continue removing the versions specified? Type yes to confirm: ");
-    if (result !== "yes") {
-      p.log.warn("Not confirmed, aborting removal...");
-      return;
+    const result = prompt('Do you want to continue removing the versions specified? Type yes to confirm: ')
+    if (result !== 'yes') {
+      p.log.warn('Not confirmed, aborting removal...')
+      return
     }
   }
 
   // Yes, lets clean it up
-  p.log.success("You have confirmed removal, removing versions now");
-  await removeVersions(toRemove, supabase, appid, userId);
-  p.outro(`Done ✅`);
+  p.log.success('You have confirmed removal, removing versions now')
+  await removeVersions(toRemove, supabase, appid, userId)
+  p.outro(`Done ✅`)
   process.exit()
 }

package/src/bundle/compatibility.ts

@@ -1,73 +1,70 @@
-import * as p from '@clack/prompts';
-import { program } from 'commander';
-import { Table } from 'console-table-printer';
-import { createSupabaseClient, findSavedKey, getConfig, verifyUser, checkCompatibility, OptionsBase } from '../utils';
-import { checkAppExistsAndHasPermissionErr } from '../api/app';
+import * as p from '@clack/prompts'
+import { program } from 'commander'
+import { Table } from 'console-table-printer'
+import type { OptionsBase } from '../utils'
+import { checkCompatibility, createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils'
+import { checkAppExistsAndHasPermissionErr } from '../api/app'
 
 interface Options extends OptionsBase {
-    channel?: string,
-    text?: boolean,
+  channel?: string
+  text?: boolean
 }
 
-export const checkCompatibilityCommand = async (appId: string, options: Options) => {
-    p.intro(`Check compatibility`);
-    options.apikey = options.apikey || findSavedKey()
-    const config = await getConfig();
-    appId = appId || config?.app?.appId
+export async function checkCompatibilityCommand(appId: string, options: Options) {
+  p.intro(`Check compatibility`)
+  options.apikey = options.apikey || findSavedKey()
+  const config = await getConfig()
+  appId = appId || config?.app?.appId
 
-    const { channel } = options;
+  const { channel } = options
 
- 
-    if (!channel) {
-        p.log.error("Missing argument, you need to provide a channel");
-        program.error('');
-    }
+  if (!channel) {
+    p.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");
-        program.error('');
-    }
-    if (!appId) {
-        p.log.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-        program.error('');
-    }
-    
-    const supabase = await createSupabaseClient(options.apikey)
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const _ = await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload']);
+  if (!options.apikey) {
+    p.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')
+    program.error('')
+  }
 
-    // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appId);
+  const supabase = await createSupabaseClient(options.apikey)
+  await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload'])
 
-    // const hashedLocalDependencies = new Map(dependenciesObject
-    //     .filter((a) => !!a.native && a.native !== undefined)
-    //     .map((a) => [a.name, a]))
+  // Check we have app access to this appId
+  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appId)
 
-    // const nativePackages = Array.from(hashedLocalDependencies, ([name, value]) => ({ name, version: value.version }))
-    // await supabase.from('app_versions').update({ native_packages: nativePackages }).eq('id', '9654')
+  // const hashedLocalDependencies = new Map(dependenciesObject
+  //     .filter((a) => !!a.native && a.native !== undefined)
+  //     .map((a) => [a.name, a]))
 
-    const { finalCompatibility } = await checkCompatibility(supabase, appId, channel)
+  // const nativePackages = Array.from(hashedLocalDependencies, ([name, value]) => ({ name, version: value.version }))
+  // await supabase.from('app_versions').update({ native_packages: nativePackages }).eq('id', '9654')
 
+  const { finalCompatibility } = await checkCompatibility(supabase, appId, channel)
 
-    const t = new Table({
-        title: "Compatibility",
-        charLength: { "❌": 2, "✅": 2 },
-    });
-    
+  const t = new Table({
+    title: 'Compatibility',
+    charLength: { '❌': 2, '✅': 2 },
+  })
 
-    const yesSymbol = options.text ? 'Yes' : '✅'
-    const noSymbol = options.text ? 'No' : '❌'
+  const yesSymbol = options.text ? 'Yes' : '✅'
+  const noSymbol = options.text ? 'No' : '❌'
 
-    finalCompatibility.forEach((data) => {
-        const { name, localVersion, remoteVersion } = data
+  finalCompatibility.forEach((data) => {
+    const { name, localVersion, remoteVersion } = data
 
-        t.addRow({
-            Package: name,
-            'Local version': localVersion ?? 'None',
-            'Remote version': remoteVersion ?? 'None',
-            Compatible: remoteVersion === localVersion ? yesSymbol : noSymbol,
-        });
+    t.addRow({
+      'Package': name,
+      'Local version': localVersion ?? 'None',
+      'Remote version': remoteVersion ?? 'None',
+      'Compatible': remoteVersion === localVersion ? yesSymbol : noSymbol,
     })
-    
-    p.log.success(t.render());
+  })
+
+  p.log.success(t.render())
 }

package/src/bundle/decrypt.ts

@@ -1,31 +1,32 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs'
+import process from 'node:process'
 import { program } from 'commander'
-import * as p from '@clack/prompts';
-import { decryptSource } from '../api/crypto';
-import { baseKey, getConfig } from '../utils';
-import { checkLatest } from '../api/update';
+import * as p from '@clack/prompts'
+import { decryptSource } from '../api/crypto'
+import { baseKey, getConfig } from '../utils'
+import { checkLatest } from '../api/update'
 
 interface Options {
   key?: string
   keyData?: string
 }
 
-export const decryptZip = async (zipPath: string, ivsessionKey: string, options: Options) => {
-  p.intro(`Decrypt zip file`);
-  await checkLatest();
+export async function decryptZip(zipPath: string, ivsessionKey: string, options: Options) {
+  p.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}`);
-    program.error('');
+    p.log.error(`Zip not found at the path ${zipPath}`)
+    program.error('')
   }
 
-  const config = await getConfig();
-  const { extConfig } = config.app;
+  const config = await getConfig()
+  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}`);
-    program.error('');
+    p.log.error(`Private Key not found at the path ${baseKey} or in ${config.app.extConfigFilePath}`)
+    program.error('')
   }
   const keyPath = options.key || baseKey
   // check if publicKey exist
@@ -33,9 +34,10 @@ export const decryptZip = async (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}`);
-    program.error('');
-  } else if (existsSync(keyPath)) {
+    p.log.error(`Cannot find public key ${keyPath} or as keyData option or in ${config.app.extConfigFilePath}`)
+    program.error('')
+  }
+  else if (existsSync(keyPath)) {
     // open with fs publicKey path
     const keyFile = readFileSync(keyPath)
     privateKey = keyFile.toString()
@@ -43,10 +45,10 @@ export const decryptZip = async (zipPath: string, ivsessionKey: string, options:
   // console.log('privateKey', privateKey)
 
   const zipFile = readFileSync(zipPath)
-  
-  const decodedZip = decryptSource(zipFile, ivsessionKey,  options.keyData ?? privateKey ?? '')
+
+  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`);
+  p.outro(`Decrypted zip file at ${zipPath}_decrypted.zip`)
   process.exit()
 }

package/src/bundle/delete.ts

@@ -1,51 +1,53 @@
-import { program } from 'commander';
-import * as p from '@clack/prompts';
-import { checkAppExistsAndHasPermissionErr } from '../api/app';
-import { OptionsBase, createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils';
-import { deleteSpecificVersion } from '../api/versions';
+import process from 'node:process'
+import { program } from 'commander'
+import * as p from '@clack/prompts'
+import { checkAppExistsAndHasPermissionErr } from '../api/app'
+import type { OptionsBase } from '../utils'
+import { createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils'
+import { deleteSpecificVersion } from '../api/versions'
 
 interface Options extends OptionsBase {
-  bundle: string;
+  bundle: string
 }
 
-export const deleteBundle = async (bundleId: string, appId: string, options: Options) => {
-  p.intro(`Delete bundle`);
+export async function deleteBundle(bundleId: string, appId: string, options: Options) {
+  p.intro(`Delete bundle`)
   options.apikey = options.apikey || findSavedKey()
-  const config = await getConfig();
+  const config = await getConfig()
   appId = appId || config?.app?.appId
 
   if (!options.apikey) {
-    p.log.error("Missing API key, you need to provide a API key to upload your bundle");
-    program.error('');
+    p.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");
-    program.error('');
+    p.log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
+    program.error('')
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
+  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appId);
+  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appId)
 
   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');
-    program.error('');
+    p.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');
-    program.error('');
+    p.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');
-    program.error('');
+    p.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`);
+  p.log.info(`Deleting bundle ${appId}@${bundleId} from Capgo`)
 
-  await deleteSpecificVersion(supabase, appId, userId, bundleId);
-  p.log.success(`Bundle ${appId}@${bundleId} deleted in Capgo`);
-  p.outro(`Done`);
+  await deleteSpecificVersion(supabase, appId, userId, bundleId)
+  p.log.success(`Bundle ${appId}@${bundleId} deleted in Capgo`)
+  p.outro(`Done`)
   process.exit()
 }

package/src/bundle/encrypt.ts

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