@capgo/cli 2.5.10 → 3.0.0-alpha.1

package/src/{bin/index.ts → index.ts}

@@ -1,41 +1,76 @@
 import { program } from 'commander';
-import { decryptZip } from './decrypt';
-import { encryptZip } from './encrypt';
-import { addApp } from './add';
+import { decryptZip } from './bundle/decrypt';
+import { encryptZip } from './bundle/encrypt';
+import { addApp } from './app/add';
 import { manageKey } from './key';
-import { manageChannel } from './channel';
-import { deleteApp } from './delete';
-import { setChannel } from './set';
-import { uploadVersion } from './upload';
-import pack from '../../package.json'
+import { deleteVersion } from './bundle/delete';
+import { setChannel } from './channel/set';
+import { uploadVersion } from './bundle/upload';
+import pack from '../package.json'
 import { login } from './login';
-import { listApp } from './list';
-import { cleanupApp } from './cleanup';
+import { listApp } from './app/list';
+import { cleanupApp } from './bundle/cleanup';
+import { addChannel } from './channel/add';
+import { deleteChannel } from './channel/delete';
+import { listChannels } from './channel/list';
+import { setApp } from './app/set';
+import { deleteApp } from './app/delete';
 
 program
   .description('Manage packages and bundle versions in capgo Cloud')
   .version(pack.version);
 
 program
+  .command('login [apikey]')
+  .alias('l')
+  .description('Save apikey to your machine or folder')
+  .action(login)
+  .option('--local', 'Only save in local folder');
+
+const app = program
+  .command('app')
+  .description('Manage app');
+
+app
   .command('add [appid]')
   .alias('a')
-  .description('Add a new app to capgo Cloud')
+  .description('Add a new app in capgo Cloud')
   .action(addApp)
   .option('-n, --name <name>', 'app name')
   .option('-i, --icon <icon>', 'app icon path')
   .option('-a, --apikey <apikey>', 'apikey to link to your account');
 
-program
-  .command('login [apikey]')
+app
+  .command('delete [appid]')
+  .alias('d')
+  .description('Delete an app in capgo Cloud')
+  .action(deleteApp)
+  .option('-a, --apikey <apikey>', 'apikey to link to your account');
+
+app
+  .command('list [appid]')
   .alias('l')
-  .description('Save apikey to your machine or folder')
-  .action(login)
-  .option('--local', 'Only save in local folder');
+  .description('list apps in capgo Cloud')
+  .action(listApp)
+  .option('-a, --apikey <apikey>', 'apikey to link to your account');
 
-program
+app
+  .command('set [appid]')
+  .alias('s')
+  .description('Set an app in capgo Cloud')
+  .action(setApp)
+  .option('-n, --name <name>', 'app name')
+  .option('-i, --icon <icon>', 'app icon path')
+  .option('-a, --apikey <apikey>', 'apikey to link to your account');
+
+const bundle = program
+  .command('bundle')
+  .description('Manage bundle');
+
+bundle
   .command('upload [appid]')
   .alias('u')
-  .description('Upload a new bundle to capgo Cloud')
+  .description('Upload a new bundle in capgo Cloud')
   .action(uploadVersion)
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
   .option('-p, --path <path>', 'path of the folder to upload')
@@ -47,56 +82,72 @@ program
   .option('--display-iv-session', 'Show in the console the iv and session key used to encrypt the update')
   .option('-b, --bundle <bundle>', 'bundle version number of the file to upload');
 
-program
-  .command('set [appid]')
-  .alias('s')
-  .description('Modify a channel configuration')
-  .action(setChannel)
-  .requiredOption('-c, --channel <channel>', 'channel to link to')
-  .option('-a, --apikey <apikey>', 'apikey to link to your account')
-  .option('-b, --bundle <bundle>', 'bundle version number of the file to set')
-  .option('-s, --state <state>', 'set the state of the channel, default or normal')
-  .option('--downgrade', 'Allow to downgrade to version under native one')
-  .option('--latest', 'get the latest version key in the package.json to set it to the channel')
-  .option('--no-downgrade', 'Disable downgrade to version under native one')
-  .option('--upgrade', 'Allow to upgrade to version above native one')
-  .option('--no-upgrade', 'Disable upgrade to version above native one')
-  .option('--ios', 'Allow sending update to ios devices')
-  .option('--no-ios', 'Disable sending update to ios devices')
-  .option('--android', 'Allow sending update to android devices')
-  .option('--no-android', 'Disable sending update to android devices')
-  .option('--self-assign', 'Allow to device to self assign to this channel')
-  .option('--no-self-assign', 'Disable devices to self assign to this channel');
-
-program
+bundle
   .command('delete [appid]')
   .alias('d')
-  .description('Delete an app from capgo Cloud')
-  .action(deleteApp)
+  .description('Delete a bundle in capgo Cloud')
+  .action(deleteVersion)
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
-  .option('-b, --bundle <bundle>', 'bundle version number of the app to delete');
 
-program
+bundle
   .command('list [appid]')
-  .alias('ls')
-  .description('List versions in capgo Cloud')
+  .alias('l')
+  .description('List bundle in capgo Cloud')
   .action(listApp)
   .option('-a, --apikey <apikey>', 'apikey to link to your account');
 
-program
+bundle
   .command('cleanup [appid]')
   .alias('c')
-  .description('Cleanup versions in capgo Cloud')
   .action(cleanupApp)
+  .description('Cleanup bundle in capgo Cloud')
   .option('-b, --bundle <bundle>', 'bundle version number of the app to delete')
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
   .option('-k, --keep <keep>', 'number of version to keep')
   .option('-f, --force', 'force removal');
 
-program
-  .command('channel [mode] [channelid] [appid]')
-  .description('Create, set or delete channel')
-  .action(manageChannel)
+bundle
+  .command('decrypt [zipPath] [sessionKey]')
+  .alias('l')
+  .description('Decrypt a signed zip bundle')
+  .action(decryptZip)
+  .option('--key <key>', 'custom path for private signing key')
+  .option('--keyData <keyData>', 'base64 private signing key');
+
+bundle
+  .command('encrypt [zipPath]')
+  .description('Encrypt a zip bundle')
+  .action(encryptZip)
+  .option('--key <key>', 'custom path for private signing key')
+  .option('--keyData <keyData>', 'base64 private signing key');
+
+const channel = program
+  .command('channel')
+  .description('Manage channel');
+
+channel
+  .command('add [channelid] [appid]')
+  .alias('a')
+  .description('Create channel')
+  .action(addChannel)
+
+channel
+  .command('delete [channelid] [appid]')
+  .alias('d')
+  .description('Delete channel')
+  .action(deleteChannel)
+
+channel
+  .command('list [appid]')
+  .alias('l')
+  .description('List channel')
+  .action(listChannels)
+
+channel
+  .command('set [channelid] [appid]')
+  .alias('s')
+  .description('Set channel')
+  .action(setChannel)
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
   .option('-b, --bundle <bundle>', 'bundle version number of the file to set')
   .option('-s, --state <state>', 'set the state of the channel, default or normal')
@@ -118,19 +169,4 @@ program
   .action(manageKey)
   .option('-f, --force', 'force generate a new one');
 
-
-program
-  .command('decrypt [zipPath] [sessionKey]')
-  .description('Decrypt a signed zip update')
-  .action(decryptZip)
-  .option('--key <key>', 'custom path for private signing key')
-  .option('--keyData <keyData>', 'base64 private signing key');
-
-program
-  .command('encrypt [zipPath]')
-  .description('Encrypt a zip update')
-  .action(encryptZip)
-  .option('--key <key>', 'custom path for private signing key')
-  .option('--keyData <keyData>', 'base64 private signing key');
-
 program.parseAsync();

package/src/{bin/key.ts → key.ts}

@@ -1,7 +1,7 @@
 import { program } from 'commander'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
 import { writeConfig } from '@capacitor/cli/dist/config';
-import { createRSA } from '../api/crypto';
+import { createRSA } from './api/crypto';
 import { baseKey, baseKeyPub, getConfig } from './utils';
 
 interface Options {

package/src/{bin/utils.ts → utils.ts}

@@ -217,7 +217,7 @@ export const verifyUser = async (supabase: SupabaseClient<Database>, apikey: str
     return userId;
 }
 
-export const getHumanDate = (row: Database['public']['Tables']['app_versions']['Row']) => {
-    const date = new Date(row.created_at || '');
+export const getHumanDate = (createdA: string | null) => {
+    const date = new Date(createdA || '');
     return date.toLocaleString();
 }

package/webpack.config.js

@@ -6,7 +6,7 @@ module.exports = {
   mode: process.env.NODE_ENV || 'production',
   target: 'node',
   externals: [nodeExternals()],
-  entry: './src/bin/index.ts',
+  entry: './src/index.ts',
   module: {
     rules: [
       {

package/src/bin/channel.ts

@@ -1,122 +0,0 @@
-import { SupabaseClient } from '@supabase/supabase-js'
-import { program } from 'commander'
-import { Database } from 'types/supabase.types'
-import { setChannelInternal } from './set';
-import { checkAppExistsAndHasPermission } from "../api/app";
-import {
-  getConfig, createSupabaseClient,
-  findSavedKey, checkPlanValid,
-  verifyUser,
-  useLogSnag,
-} from './utils';
-
-interface Options {
-  apikey: string;
-  bundle: string;
-  state?: string;
-  downgrade?: boolean;
-  latest?: boolean;
-  upgrade?: boolean;
-  ios?: boolean;
-  android?: boolean;
-  selfAssign?: boolean;
-  channel?: string;
-}
-
-const findUnknownVersion = (supabase: SupabaseClient<Database>, appId: string) => supabase
-  .from('app_versions')
-  .select('id')
-  .eq('app_id', appId)
-  .eq('name', 'unknown')
-  .single()
-
-
-const createChannel = (supabase: SupabaseClient<Database>, update: Database['public']['Tables']['channels']['Insert']) => supabase
-  .from('channels')
-  .insert(update)
-  .select()
-  .single()
-
-const deleteChannel = (supabase: SupabaseClient<Database>, name: string, appId: string, userId: string) => supabase
-  .from('channels')
-  .delete()
-  .eq('name', name)
-  .eq('app_id', appId)
-  .eq('user_id', userId)
-  .single()
-
-export const manageChannel = async (mode: string, channelId: string, appid: string, options: Options) => {
-  const apikey = options.apikey || findSavedKey()
-  const config = await getConfig();
-  appid = appid || config?.app?.appId
-  const snag = useLogSnag()
-
-  if (!apikey) {
-    program.error("Missing API key, you need to provide a API key to upload your bundle");
-  }
-  if (!appid || !channelId) {
-    program.error("Missing argument, you need to provide a appid and a channel name, or be in a capacitor project");
-  }
-  const supabase = createSupabaseClient(apikey)
-
-  const userId = await verifyUser(supabase, apikey, ['write', 'all']);
-  await checkPlanValid(supabase, userId, false)
-  // Check we have app access to this appId
-  await checkAppExistsAndHasPermission(supabase, appid, apikey);
-
-  if (mode === 'create') {
-    console.log(`Create channel ${appid}#${channelId} to Capgo cloud`);
-    try {
-      const { data } = await findUnknownVersion(supabase, appid)
-      if (!data) {
-        program.error(`Cannot find default version for channel creation, please contact Capgo support 🤨`);
-      }
-      await createChannel(supabase, { name: channelId, app_id: appid, version: data.id, created_by: userId });
-      console.log(`Channel created ✅`);
-      await snag.publish({
-        channel: 'app',
-        event: 'Create channel',
-        icon: '✅',
-        tags: {
-          'user-id': userId,
-          'app-id': appid,
-          'channel': channelId,
-        },
-        notify: false,
-      }).catch()
-    } catch (error) {
-      console.log(`Cannot create Channel 🙀`, error);
-    }
-  } else if (mode === 'delete') {
-    console.log(`Delete channel ${appid}#${channelId} to Capgo cloud`);
-    try {
-      await deleteChannel(supabase, channelId, appid, userId);
-      console.log(`Channel Delete ✅`);
-      await snag.publish({
-        channel: 'app',
-        event: 'Delete channel',
-        icon: '✅',
-        tags: {
-          'user-id': userId,
-          'app-id': appid,
-          'channel': channelId,
-        },
-        notify: false,
-      }).catch()
-    } catch (error) {
-      console.log(`Cannot delete Channel 🙀`, error);
-    }
-  } else if (mode === 'set') {
-    console.log(`Set channel ${appid}#${channelId} to Capgo cloud`);
-    try {
-      options.channel = channelId
-      await setChannelInternal(appid, apikey, config?.app?.package?.version, snag, options);
-      console.log(`Channel Set ✅`);
-    } catch (error) {
-      console.log(`Cannot set Channel 🙀`, error);
-    }
-  } else {
-    program.error('You should provide a valid option (create or delete)');
-  }
-  process.exit()
-}

package/src/bin/delete.ts

@@ -1,99 +0,0 @@
-import { program } from 'commander';
-import { createSupabaseClient, findSavedKey, formatError, getConfig, useLogSnag, verifyUser } from './utils';
-// import { definitions } from '../types/types_supabase';
-import { deleteSpecificVersion } from '../api/versions';
-
-interface Options {
-  apikey: string;
-  bundle: string;
-}
-
-export const deleteApp = async (appid: string, options: Options) => {
-  const { bundle } = options;
-  const apikey = options.apikey || findSavedKey()
-  const config = await getConfig();
-  const snag = useLogSnag()
-
-  appid = appid || config?.app?.appId
-  if (!apikey) {
-    program.error('Missing API key, you need to provide an API key to delete your app');
-  }
-  if (!appid) {
-    program.error('Missing argument, you need to provide a appid, or be in a capacitor project');
-  }
-
-  const supabase = createSupabaseClient(apikey)
-
-  const userId = await verifyUser(supabase, apikey);
-
-  const { data: app, error: dbError0 } = await supabase
-    .rpc('exist_app', { appid, apikey })
-    .single()
-  if (!app || dbError0) {
-    program.error('No permission to delete')
-  }
-
-  if (bundle) {
-    console.log(`Delete ${appid}@${bundle} from Capgo`);
-
-    await deleteSpecificVersion(supabase, appid, userId, bundle);
-    console.log(`${appid}@${bundle} deleted from server`)
-    return
-  }
-
-  console.log(`Delete ${appid} from Capgo`);
-  const { data, error: vError } = await supabase
-    .from('app_versions')
-    .select()
-    .eq('app_id', appid)
-    .eq('user_id', userId)
-
-  if (vError) {
-    program.error(`App ${appid} not found in database ${formatError(vError)} `)
-  }
-
-  if (data && data.length) {
-    const filesToRemove = data
-      .filter((x => x.bucket_id && !x.external_url))
-      .map(x => `${userId}/${appid}/versions/${x.bucket_id} `)
-    const { error: delError } = await supabase
-      .storage
-      .from('apps')
-      .remove(filesToRemove)
-    if (delError) {
-      program.error(`Cannot delete stored version for app ${appid} from storage ${formatError(delError)} `)
-    }
-  }
-
-  const { error: delAppVersionError } = await supabase
-    .from('app_versions')
-    .delete()
-    .eq('app_id', appid)
-    .eq('user_id', userId)
-
-  if (delAppVersionError) {
-    program.error(`Cannot delete version for app ${appid} from database ${formatError(delAppVersionError)} `)
-  }
-
-  const { error: dbAppError } = await supabase
-    .from('apps')
-    .delete()
-    .eq('app_id', appid)
-    .eq('user_id', userId)
-
-  if (dbAppError) {
-    program.error(`Cannot delete from database ${formatError(dbAppError)} `)
-  }
-  await snag.publish({
-    channel: 'app',
-    event: 'App Deleted',
-    icon: '😱',
-    tags: {
-      'user-id': userId,
-      'app-id': appid,
-    },
-    notify: false,
-  }).catch()
-  console.log(`${appid} deleted from server`)
-  process.exit()
-}