@capgo/cli 2.2.10 → 2.3.5

package/src/bin/delete.ts

@@ -1,6 +1,6 @@
 import { program } from 'commander';
 import { createSupabaseClient, findSavedKey, formatError, getConfig, useLogSnag, verifyUser } from './utils';
-import { definitions } from '../types/types_supabase';
+// import { definitions } from '../types/types_supabase';
 import { deleteSpecificVersion } from '../api/versions';
 
 interface Options {
@@ -27,7 +27,8 @@ export const deleteApp = async (appid: string, options: Options) => {
   const userId = await verifyUser(supabase, apikey);
 
   const { data: app, error: dbError0 } = await supabase
-    .rpc<string>('exist_app', { appid, apikey })
+    .rpc('exist_app', { appid, apikey })
+    .single()
   if (!app || dbError0) {
     program.error('No permission to delete')
   }
@@ -42,7 +43,7 @@ export const deleteApp = async (appid: string, options: Options) => {
 
   console.log(`Delete ${appid} from Capgo`);
   const { data, error: vError } = await supabase
-    .from<definitions['app_versions']>('app_versions')
+    .from('app_versions')
     .select()
     .eq('app_id', appid)
     .eq('user_id', userId)
@@ -63,7 +64,7 @@ export const deleteApp = async (appid: string, options: Options) => {
   }
 
   const { error: delAppVersionError } = await supabase
-    .from<definitions['app_versions']>('app_versions')
+    .from('app_versions')
     .delete()
     .eq('app_id', appid)
     .eq('user_id', userId)
@@ -73,7 +74,7 @@ export const deleteApp = async (appid: string, options: Options) => {
   }
 
   const { error: dbAppError } = await supabase
-    .from<definitions['apps']>('apps')
+    .from('apps')
     .delete()
     .eq('app_id', appid)
     .eq('user_id', userId)

package/src/bin/index.ts

@@ -86,7 +86,7 @@ program
   .alias('c')
   .description('Cleanup versions in capgo Cloud')
   .action(cleanupApp)
-  .requiredOption('-b, --bundle <bundle>', 'bundle version number of the app to delete')
+  .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');

package/src/bin/list.ts

@@ -1,7 +1,7 @@
 import { program } from 'commander';
-import { createSupabaseClient, findSavedKey, getConfig, getHumanDate, verifyUser } from './utils';
+import { createSupabaseClient, findSavedKey, getConfig, verifyUser } from './utils';
 import { checkAppExistsAndHasPermission } from '../api/app';
-import { getActiveAppVersions } from '../api/versions';
+import { displayBundles, getActiveAppVersions } from '../api/versions';
 
 interface Options {
   apikey: string;
@@ -29,13 +29,10 @@ export const listApp = async (appid: string, options: Options) => {
   await checkAppExistsAndHasPermission(supabase, appid, apikey);
 
   // Get all active app versions we might possibly be able to cleanup
-  const data = await getActiveAppVersions(supabase, appid, userId);
+  const allVersions = await getActiveAppVersions(supabase, appid, userId);
 
-  console.log(`Active versions in Capgo: ${data?.length}`);
+  console.log(`Active versions in Capgo: ${allVersions?.length}`);
 
-  data?.forEach(row => {
-    // convert created_at to human time
-    console.log(`${row.name} created on ${(getHumanDate(row))}`);
-  });
+  displayBundles(allVersions);
 
 }

package/src/bin/set.ts

@@ -1,9 +1,10 @@
 import { program } from 'commander';
+import { Database } from 'types/supabase.types';
 import {
   getConfig, createSupabaseClient, updateOrCreateChannel,
   formatError, findSavedKey, checkPlanValid, useLogSnag, verifyUser
 } from './utils';
-import { definitions } from '../types/types_supabase';
+// import { definitions } from '../types/types_supabase';
 
 interface Options {
   apikey: string;
@@ -48,7 +49,7 @@ export const setChannel = async (appid: string, options: Options) => {
     const supabase = createSupabaseClient(apikey)
     const userId = await verifyUser(supabase, apikey, ['write', 'all']);
     await checkPlanValid(supabase, userId)
-    const channelPayload: Partial<definitions['channels']> = {
+    const channelPayload: Partial<Database['public']['Tables']['channels']['Row']> = {
       created_by: userId,
       app_id: appid,
       name: channel,
@@ -56,7 +57,7 @@ export const setChannel = async (appid: string, options: Options) => {
     const bundleVersion = latest ? config?.app?.package?.version : bundle
     if (bundleVersion) {
       const { data, error: vError } = await supabase
-        .from<definitions['app_versions']>('app_versions')
+        .from('app_versions')
         .select()
         .eq('app_id', appid)
         .eq('name', bundleVersion)

package/src/bin/upload.ts

@@ -7,7 +7,9 @@ import { checksum as getChecksum } from '@tomasklaen/checksum';
 import { encryptSource } from '../api/crypto';
 import {
   host, hostWeb, getConfig, createSupabaseClient,
-  updateOrCreateChannel, updateOrCreateVersion, formatError, findSavedKey, checkPlanValid, useLogSnag, verifyUser, regexSemver, baseKeyPub
+  updateOrCreateChannel, updateOrCreateVersion,
+  formatError, findSavedKey, checkPlanValid,
+  useLogSnag, verifyUser, regexSemver, baseKeyPub, convertAppName
 } from './utils';
 
 interface Options {
@@ -63,6 +65,7 @@ export const uploadVersion = async (appid: string, options: Options) => {
   // checking if user has access rights before uploading
   const { data: versionExist, error: versionExistError } = await supabase
     .rpc('exist_app_versions', { apikey, name_version: bundle, appid })
+    .single()
 
   if (versionExist || versionExistError) {
     multibar.stop()
@@ -70,7 +73,7 @@ export const uploadVersion = async (appid: string, options: Options) => {
   }
   b1.increment();
   const { data: isTrial, error: isTrialsError } = await supabase
-    .rpc<number>('is_trial', { userid: userId })
+    .rpc('is_trial', { userid: userId })
     .single()
   if (isTrial && isTrial > 0 || isTrialsError) {
     multibar.log(`WARNING !!\nTrial expires in ${isTrial} days, upgrade here: ${hostWeb}/dashboard/settings/plans\n`);
@@ -78,7 +81,9 @@ export const uploadVersion = async (appid: string, options: Options) => {
   b1.increment();
 
   const { data: app, error: appError } = await supabase
-    .rpc<string>('exist_app', { appid, apikey })
+    .rpc('exist_app', { appid, apikey })
+    .single()
+
   if (!app || appError) {
     multibar.stop()
     program.error(`Cannot find app ${appid} in your account \n${formatError(appError)}`)
@@ -86,7 +91,9 @@ export const uploadVersion = async (appid: string, options: Options) => {
   b1.increment();
   // check if app already exist
   const { data: appVersion, error: appVersionError } = await supabase
-    .rpc<string>('exist_app_versions', { appid, apikey, name_version: bundle })
+    .rpc('exist_app_versions', { appid, apikey, name_version: bundle })
+    .single()
+
   if (appVersion || appVersionError) {
     program.error(`Version already exists ${formatError(appVersionError)}`)
   }
@@ -171,7 +178,7 @@ export const uploadVersion = async (appid: string, options: Options) => {
     multibar.log('Cannot set bundle with upload key, use key with more rights for that\n');
   }
   multibar.stop()
-  const appidWeb = appid.replace(/\./g, '--')
+  const appidWeb = convertAppName(appid)
   console.log("App uploaded to server")
   console.log(`Try it in mobile app: ${host}/app_mobile`)
   console.log(`Or set the channel ${channel} as public here: ${hostWeb}/app/package/${appidWeb}`)

package/src/bin/utils.ts

@@ -5,7 +5,7 @@ import prettyjson from 'prettyjson';
 import { existsSync, readFileSync } from 'fs';
 import { homedir } from 'os';
 import { LogSnag } from 'logsnag';
-import { definitions } from '../types/types_supabase';
+import { Database } from 'types/supabase.types';
 
 export const baseKey = '.capgo_key';
 export const baseKeyPub = `${baseKey}.pub`;
@@ -23,9 +23,11 @@ export const supaAnon = process.env.SUPA_DB === 'production'
     : 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImF1Y3N5YnZuaGF2b2dkbXp3dGN3Iiwicm9sZSI6ImFub24iLCJpYXQiOjE2NTQ1Mzk1MDYsImV4cCI6MTk3MDExNTUwNn0.HyuZmo_EjF5fgZQU3g37bdNardK1CLHgxXmYqtr59bo'
 /* eslint-enable */
 
-export const createSupabaseClient = (apikey: string) => createClient(hostSupa, supaAnon, {
-    headers: {
-        capgkey: apikey,
+export const createSupabaseClient = (apikey: string) => createClient<Database>(hostSupa, supaAnon, {
+    global: {
+        headers: {
+            capgkey: apikey,
+        }
     }
 })
 // eslint-disable-next-line max-len
@@ -34,6 +36,7 @@ export const regexSemver = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[
 export const checkKey = async (supabase: SupabaseClient, apikey: string, keymode: string[]) => {
     const { data: apiAccess, error: apiAccessError } = await supabase
         .rpc('is_allowed_capgkey', { apikey, keymode })
+        .single()
 
     if (!apiAccess || apiAccessError) {
         program.error(`Invalid API key or insufficient permissions ${formatError(apiAccessError)}`);
@@ -42,7 +45,7 @@ export const checkKey = async (supabase: SupabaseClient, apikey: string, keymode
 
 export const isGoodPlan = async (supabase: SupabaseClient, userId: string): Promise<boolean> => {
     const { data, error } = await supabase
-        .rpc<boolean>('is_good_plan_v2', { userid: userId })
+        .rpc('is_good_plan_v2', { userid: userId })
         .single()
     if (error) {
         throw error
@@ -52,7 +55,7 @@ export const isGoodPlan = async (supabase: SupabaseClient, userId: string): Prom
 
 export const isPaying = async (supabase: SupabaseClient, userId: string): Promise<boolean> => {
     const { data, error } = await supabase
-        .rpc<boolean>('is_paying', { userid: userId })
+        .rpc('is_paying', { userid: userId })
         .single()
     if (error) {
         throw error
@@ -62,7 +65,7 @@ export const isPaying = async (supabase: SupabaseClient, userId: string): Promis
 
 export const isTrial = async (supabase: SupabaseClient, userId: string): Promise<number> => {
     const { data, error } = await supabase
-        .rpc<number>('is_trial', { userid: userId })
+        .rpc('is_trial', { userid: userId })
         .single()
     if (error) {
         throw error
@@ -72,7 +75,7 @@ export const isTrial = async (supabase: SupabaseClient, userId: string): Promise
 
 export const isAllowedAction = async (supabase: SupabaseClient, userId: string): Promise<boolean> => {
     const { data, error } = await supabase
-        .rpc<boolean>('is_allowed_action_user', { userid: userId })
+        .rpc('is_allowed_action_user', { userid: userId })
         .single()
     if (error) {
         throw error
@@ -96,11 +99,13 @@ export const findSavedKey = () => {
     const userHomeDir = homedir();
     let keyPath = `${userHomeDir}/.capgo`;
     if (existsSync(keyPath)) {
+        console.log(`Use global apy key ${keyPath}`)
         const key = readFileSync(keyPath, 'utf8');
         return key.trim();
     }
     keyPath = `.capgo`;
     if (existsSync(keyPath)) {
+        console.log(`Use local apy key ${keyPath}`)
         const key = readFileSync(keyPath, 'utf8');
         return key.trim();
     }
@@ -131,47 +136,59 @@ export const getConfig = async () => {
     return config;
 }
 
-export const updateOrCreateVersion = async (supabase: SupabaseClient, update: Partial<definitions['app_versions']>, apikey: string) => {
+export const updateOrCreateVersion = async (supabase: SupabaseClient,
+    update: Partial<Database['public']['Tables']['app_versions']['Row']>, apikey: string) => {
     // console.log('updateOrCreateVersion', update, apikey)
     const { data, error } = await supabase
-        .rpc<string>('exist_app_versions', { appid: update.app_id, name_version: update.name, apikey })
+        .rpc('exist_app_versions', { appid: update.app_id, name_version: update.name, apikey })
+        .single()
+
     if (data && !error) {
         update.deleted = false
         return supabase
-            .from<definitions['app_versions']>('app_versions')
+            .from('app_versions')
             .update(update)
             .eq('app_id', update.app_id)
             .eq('name', update.name)
+            .single()
     }
     // console.log('create Version', data, error)
 
     return supabase
-        .from<definitions['app_versions']>('app_versions')
+        .from('app_versions')
         .insert(update)
-
+        .select()
+        .single()
 }
 
-export const updateOrCreateChannel = async (supabase: SupabaseClient, update: Partial<definitions['channels']>, apikey: string) => {
+export const updateOrCreateChannel = async (supabase: SupabaseClient,
+    update: Partial<Database['public']['Tables']['channels']['Row']>, apikey: string) => {
     // console.log('updateOrCreateChannel', update)
     if (!update.app_id || !update.name || !update.created_by) {
         console.error('missing app_id, name, or created_by')
         return Promise.reject(new Error('missing app_id, name, or created_by'))
     }
     const { data, error } = await supabase
-        .rpc<string>('exist_channel', { appid: update.app_id, name_channel: update.name, apikey })
+        .rpc('exist_channel', { appid: update.app_id, name_channel: update.name, apikey })
+        .single()
+
     if (data && !error) {
         return supabase
-            .from<definitions['channels']>('channels')
-            .update(update, { returning: "minimal" })
+            .from('channels')
+            .update(update)
             .eq('app_id', update.app_id)
             .eq('name', update.name)
             .eq('created_by', update.created_by)
+            .single()
+
     }
     // console.log('create Channel', data, error)
 
     return supabase
-        .from<definitions['channels']>('channels')
-        .insert(update, { returning: "minimal" })
+        .from('channels')
+        .insert(update)
+        .select()
+        .single()
 }
 
 export const useLogSnag = (): LogSnag => {
@@ -182,11 +199,13 @@ export const useLogSnag = (): LogSnag => {
     return logsnag
 }
 
+export const convertAppName = (appName: string) => appName.replace(/\./g, '--')
 export const verifyUser = async (supabase: SupabaseClient, apikey: string, keymod: string[] = ['all']) => {
     await checkKey(supabase, apikey, keymod);
 
     const { data: dataUser, error: userIdError } = await supabase
-        .rpc<string>('get_user_id', { apikey });
+        .rpc('get_user_id', { apikey })
+        .single();
 
     const userId = dataUser ? dataUser.toString() : '';
 
@@ -196,7 +215,7 @@ export const verifyUser = async (supabase: SupabaseClient, apikey: string, keymo
     return userId;
 }
 
-export const getHumanDate = (row: definitions["app_versions"]) => {
+export const getHumanDate = (row: Database['public']['Tables']['app_versions']['Row']) => {
     const date = new Date(row.created_at || '');
     return date.toLocaleString();
 }