@capgo/cli 2.5.10-alpha.0 → 2.5.11

package/src/bin/channel.ts

@@ -0,0 +1,122 @@
+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/{bundle → bin}/cleanup.ts

@@ -3,13 +3,13 @@ import semver from 'semver/preload';
 import promptSync from 'prompt-sync';
 import { SupabaseClient } from '@supabase/supabase-js';
 import { Database } from 'types/supabase.types';
-import { OptionsBase } from '../api/utils';
-import { createSupabaseClient, findSavedKey, getConfig, getHumanDate, verifyUser } from '../utils';
+import { createSupabaseClient, findSavedKey, getConfig, getHumanDate, verifyUser } from './utils';
 import { deleteSpecificVersion, displayBundles, getActiveAppVersions } from '../api/versions';
 import { checkAppExistsAndHasPermission } from '../api/app';
 // import { definitions } from '../types/types_supabase';
 
-interface Options extends OptionsBase {
+interface Options {
+  apikey: string;
   version: string;
   bundle: string;
   keep: number;
@@ -23,7 +23,7 @@ const removeVersions = async (toRemove: Database['public']['Tables']['app_versio
 
   // call deleteSpecificVersion one by one from toRemove sync
   for await (const row of toRemove) {
-    console.log(`Removing ${row.name} created on ${(getHumanDate(row.created_at))}`);
+    console.log(`Removing ${row.name} created on ${(getHumanDate(row))}`);
     await deleteSpecificVersion(supabase, appid, userId, row.name);
   }
 }
@@ -112,6 +112,5 @@ export const cleanupApp = async (appid: string, options: Options) => {
   // Yes, lets clean it up
   console.log("You have confirmed removal, removing versions now");
   await removeVersions(toRemove, supabase, appid, userId);
-  console.log(`Done ✅`);
   process.exit()
 }

package/src/{bundle → bin}/decrypt.ts

@@ -1,7 +1,7 @@
 import { program } from 'commander'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
 import { decryptSource } from '../api/crypto';
-import { baseKey, getConfig } from '../utils';
+import { baseKey, getConfig } from './utils';
 
 interface Options {
   key?: string
@@ -39,6 +39,5 @@ export const decryptZip = async (zipPath: string, ivsessionKey: string, options:
   const decodedZip = decryptSource(zipFile, ivsessionKey, privateKey)
   // write decodedZip in a file
   writeFileSync(`${zipPath}_decrypted.zip`, decodedZip)
-  console.log(`Done ✅`);
   process.exit()
 }

package/src/bin/delete.ts

@@ -0,0 +1,99 @@
+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()
+}

package/src/{bundle → bin}/encrypt.ts

@@ -1,7 +1,7 @@
 import { program } from 'commander'
 import { existsSync, readFileSync, writeFileSync } from 'fs'
 import { encryptSource } from '../api/crypto';
-import { baseKeyPub } from '../utils';
+import { baseKeyPub } from './utils';
 
 interface Options {
   key?: string
@@ -33,6 +33,5 @@ export const encryptZip = async (zipPath: string, options: Options) => {
   console.log('ivSessionKey', encodedZip.ivSessionKey)
   // write decodedZip in a file
   writeFileSync(`${zipPath}_encrypted.zip`, encodedZip.encryptedData)
-  console.log(`Done ✅`);
   process.exit()
 }

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

@@ -1,76 +1,41 @@
 import { program } from 'commander';
-import { decryptZip } from './bundle/decrypt';
-import { encryptZip } from './bundle/encrypt';
-import { addApp } from './app/add';
+import { decryptZip } from './decrypt';
+import { encryptZip } from './encrypt';
+import { addApp } from './add';
 import { manageKey } from './key';
-import { deleteVersion } from './bundle/delete';
-import { setChannel } from './channel/set';
-import { uploadVersion } from './bundle/upload';
-import pack from '../package.json'
+import { manageChannel } from './channel';
+import { deleteApp } from './delete';
+import { setChannel } from './set';
+import { uploadVersion } from './upload';
+import pack from '../../package.json'
 import { login } from './login';
-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';
+import { listApp } from './list';
+import { cleanupApp } from './cleanup';
 
 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 in capgo Cloud')
+  .description('Add a new app to 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');
 
-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]')
+program
+  .command('login [apikey]')
   .alias('l')
-  .description('list apps in capgo Cloud')
-  .action(listApp)
-  .option('-a, --apikey <apikey>', 'apikey to link to your account');
-
-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');
+  .description('Save apikey to your machine or folder')
+  .action(login)
+  .option('--local', 'Only save in local folder');
 
-bundle
+program
   .command('upload [appid]')
   .alias('u')
-  .description('Upload a new bundle in capgo Cloud')
+  .description('Upload a new bundle to capgo Cloud')
   .action(uploadVersion)
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
   .option('-p, --path <path>', 'path of the folder to upload')
@@ -82,72 +47,56 @@ bundle
   .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');
 
-bundle
+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
   .command('delete [appid]')
   .alias('d')
-  .description('Delete a bundle in capgo Cloud')
-  .action(deleteVersion)
+  .description('Delete an app from capgo Cloud')
+  .action(deleteApp)
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
+  .option('-b, --bundle <bundle>', 'bundle version number of the app to delete');
 
-bundle
+program
   .command('list [appid]')
-  .alias('l')
-  .description('List bundle in capgo Cloud')
+  .alias('ls')
+  .description('List versions in capgo Cloud')
   .action(listApp)
   .option('-a, --apikey <apikey>', 'apikey to link to your account');
 
-bundle
+program
   .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');
 
-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)
+program
+  .command('channel [mode] [channelid] [appid]')
+  .description('Create, set or delete channel')
+  .action(manageChannel)
   .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')
@@ -169,4 +118,19 @@ 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/{key.ts → bin/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/{app → bin}/list.ts

@@ -1,19 +1,22 @@
 import { program } from 'commander';
+import { createSupabaseClient, findSavedKey, getConfig, verifyUser } from './utils';
 import { checkAppExistsAndHasPermission } from '../api/app';
-import { OptionsBase } from '../api/utils';
-import { getActiveAppVersions, displayBundles } from '../api/versions';
-import { createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils';
+import { displayBundles, getActiveAppVersions } from '../api/versions';
 
-export const listApp = async (appId: string, options: OptionsBase) => {
+interface Options {
+  apikey: string;
+  version: string;
+}
+
+export const listApp = async (appid: string, options: Options) => {
   const apikey = options.apikey || findSavedKey()
   const config = await getConfig();
 
-  console.log('COMMAND DEPRECATED, use "app list" instead')
-  appId = appId || config?.app?.appId
+  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) {
+  if (!appid) {
     program.error('Missing argument, you need to provide a appid, or be in a capacitor project');
   }
   console.log(`Querying available versions in Capgo`);
@@ -22,17 +25,14 @@ export const listApp = async (appId: string, options: OptionsBase) => {
 
   const userId = await verifyUser(supabase, apikey);
 
-  console.log(`Querying available versions in Capgo`);
-
   // Check we have app access to this appId
-  await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
+  await checkAppExistsAndHasPermission(supabase, appid, apikey);
 
   // Get all active app versions we might possibly be able to cleanup
-  const allVersions = await getActiveAppVersions(supabase, appId, userId);
+  const allVersions = await getActiveAppVersions(supabase, appid, userId);
 
   console.log(`Active versions in Capgo: ${allVersions?.length}`);
 
   displayBundles(allVersions);
-  console.log(`Done ✅`);
   process.exit()
 }