@capgo/cli 3.14.20 → 3.14.22

package/src/types/supabase.types.ts

@@ -139,35 +139,41 @@ export interface Database {
         Row: {
           app_id: string
           bandwidth: number
-          created_at: string | null
-          downloads: number
+          date: string | null
           fails: number
+          get: number
           id: string
+          install: number
           mau: number
-          mode: Database["public"]["Enums"]["usage_mode"]
-          storage: number
+          storage_added: number
+          storage_deleted: number
+          uninstall: number
         }
         Insert: {
           app_id: string
           bandwidth?: number
-          created_at?: string | null
-          downloads?: number
+          date?: string | null
           fails?: number
+          get?: number
           id?: string
+          install?: number
           mau?: number
-          mode?: Database["public"]["Enums"]["usage_mode"]
-          storage?: number
+          storage_added?: number
+          storage_deleted?: number
+          uninstall?: number
         }
         Update: {
           app_id?: string
           bandwidth?: number
-          created_at?: string | null
-          downloads?: number
+          date?: string | null
           fails?: number
+          get?: number
           id?: string
+          install?: number
           mau?: number
-          mode?: Database["public"]["Enums"]["usage_mode"]
-          storage?: number
+          storage_added?: number
+          storage_deleted?: number
+          uninstall?: number
         }
         Relationships: []
       }
@@ -182,6 +188,7 @@ export interface Database {
           id: number
           minUpdateVersion: string | null
           name: string
+          native_packages: Json[] | null
           session_key: string | null
           storage_provider: string
           updated_at: string | null
@@ -197,6 +204,7 @@ export interface Database {
           id?: number
           minUpdateVersion?: string | null
           name: string
+          native_packages?: Json[] | null
           session_key?: string | null
           storage_provider?: string
           updated_at?: string | null
@@ -212,6 +220,7 @@ export interface Database {
           id?: number
           minUpdateVersion?: string | null
           name?: string
+          native_packages?: Json[] | null
           session_key?: string | null
           storage_provider?: string
           updated_at?: string | null
@@ -379,12 +388,6 @@ export interface Database {
             columns: ["created_by"]
             referencedRelation: "users"
             referencedColumns: ["id"]
-          },
-          {
-            foreignKeyName: "channel_devices_device_id_fkey"
-            columns: ["device_id"]
-            referencedRelation: "devices"
-            referencedColumns: ["device_id"]
           }
         ]
       }
@@ -561,49 +564,43 @@ export interface Database {
       devices: {
         Row: {
           app_id: string
-          created_at: string | null
+          created_at: string
           custom_id: string
-          date_id: string | null
           device_id: string
           is_emulator: boolean | null
           is_prod: boolean | null
-          last_mau: string | null
           os_version: string | null
           platform: Database["public"]["Enums"]["platform_os"] | null
           plugin_version: string
-          updated_at: string | null
+          updated_at: string
           version: number
           version_build: string | null
         }
         Insert: {
           app_id: string
-          created_at?: string | null
+          created_at: string
           custom_id?: string
-          date_id?: string | null
           device_id: string
           is_emulator?: boolean | null
           is_prod?: boolean | null
-          last_mau?: string | null
           os_version?: string | null
           platform?: Database["public"]["Enums"]["platform_os"] | null
           plugin_version?: string
-          updated_at?: string | null
+          updated_at: string
           version: number
           version_build?: string | null
         }
         Update: {
           app_id?: string
-          created_at?: string | null
+          created_at?: string
           custom_id?: string
-          date_id?: string | null
           device_id?: string
           is_emulator?: boolean | null
           is_prod?: boolean | null
-          last_mau?: string | null
           os_version?: string | null
           platform?: Database["public"]["Enums"]["platform_os"] | null
           plugin_version?: string
-          updated_at?: string | null
+          updated_at?: string
           version?: number
           version_build?: string | null
         }
@@ -647,12 +644,6 @@ export interface Database {
             referencedRelation: "users"
             referencedColumns: ["id"]
           },
-          {
-            foreignKeyName: "devices_override_device_id_fkey"
-            columns: ["device_id"]
-            referencedRelation: "devices"
-            referencedColumns: ["device_id"]
-          },
           {
             foreignKeyName: "devices_override_version_fkey"
             columns: ["version"]
@@ -916,7 +907,7 @@ export interface Database {
         Row: {
           action: string
           app_id: string
-          created_at: string | null
+          created_at: string
           device_id: string
           platform: Database["public"]["Enums"]["platform_os"]
           version: number
@@ -925,7 +916,7 @@ export interface Database {
         Insert: {
           action: string
           app_id: string
-          created_at?: string | null
+          created_at: string
           device_id: string
           platform: Database["public"]["Enums"]["platform_os"]
           version: number
@@ -934,7 +925,7 @@ export interface Database {
         Update: {
           action?: string
           app_id?: string
-          created_at?: string | null
+          created_at?: string
           device_id?: string
           platform?: Database["public"]["Enums"]["platform_os"]
           version?: number
@@ -1252,6 +1243,13 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: number
       }
+      create_partitions: {
+        Args: {
+          start_date: string
+          num_years: number
+        }
+        Returns: undefined
+      }
       delete_user: {
         Args: Record<PropertyKey, never>
         Returns: undefined
@@ -1414,6 +1412,16 @@ export interface Database {
             Returns: Database["public"]["CompositeTypes"]["stats_table"]
           }
       get_plan_usage_percent:
+        | {
+            Args: {
+              userid: string
+            }
+            Returns: number
+          }
+        | {
+            Args: Record<PropertyKey, never>
+            Returns: number
+          }
         | {
             Args: {
               dateid: string
@@ -1451,9 +1459,7 @@ export interface Database {
           }
       get_total_stats_v3:
         | {
-            Args: {
-              userid: string
-            }
+            Args: Record<PropertyKey, never>
             Returns: {
               mau: number
               bandwidth: number
@@ -1461,7 +1467,9 @@ export interface Database {
             }[]
           }
         | {
-            Args: Record<PropertyKey, never>
+            Args: {
+              userid: string
+            }
             Returns: {
               mau: number
               bandwidth: number
@@ -1469,6 +1477,12 @@ export interface Database {
             }[]
           }
       get_total_storage_size:
+        | {
+            Args: {
+              app_id: string
+            }
+            Returns: number
+          }
         | {
             Args: Record<PropertyKey, never>
             Returns: number
@@ -1545,12 +1559,20 @@ export interface Database {
             }
             Returns: boolean
           }
-      is_allowed_action: {
-        Args: {
-          apikey: string
-        }
-        Returns: boolean
-      }
+      is_allowed_action:
+        | {
+            Args: {
+              apikey: string
+              appid: string
+            }
+            Returns: boolean
+          }
+        | {
+            Args: {
+              apikey: string
+            }
+            Returns: boolean
+          }
       is_allowed_action_user:
         | {
             Args: Record<PropertyKey, never>
@@ -1640,16 +1662,16 @@ export interface Database {
             Returns: boolean
           }
       is_good_plan_v4:
-        | {
-            Args: Record<PropertyKey, never>
-            Returns: number
-          }
         | {
             Args: {
               userid: string
             }
             Returns: boolean
           }
+        | {
+            Args: Record<PropertyKey, never>
+            Returns: boolean
+          }
       is_in_channel:
         | {
             Args: {
@@ -1709,6 +1731,17 @@ export interface Database {
             }
             Returns: boolean
           }
+      is_paying_and_good_plan:
+        | {
+            Args: Record<PropertyKey, never>
+            Returns: boolean
+          }
+        | {
+            Args: {
+              userid: string
+            }
+            Returns: boolean
+          }
       is_trial:
         | {
             Args: Record<PropertyKey, never>

package/src/utils.ts

@@ -8,7 +8,6 @@ import prettyjson from 'prettyjson';
 import { LogSnag } from 'logsnag';
 import * as p from '@clack/prompts';
 import { Database } from 'types/supabase.types';
-import { CapacitorConfig } from '@capacitor/cli';
 import axios from 'axios';
 
 export const baseKey = '.capgo_key';
@@ -19,12 +18,17 @@ export const defaultHostWeb = 'https://web.capgo.app'
 // eslint-disable-next-line max-len
 export const regexSemver = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
 
+export interface OptionsBase {
+    apikey: string;
+}
+
 export const getConfig = async () => {
     let config: Config;
     try {
         config = await loadConfig();
     } catch (err) {
-        program.error("No capacitor config file found, run `cap init` first");
+        p.log.error('No capacitor config file found, run `cap init` first');
+        program.error('')
     }
     return config;
 }
@@ -72,7 +76,8 @@ export const getRemoteConfig = async () => {
 export const createSupabaseClient = async (apikey: string) => {
     const config = await getRemoteConfig()
     if (!config.supaHost || !config.supaKey) {
-        program.error('Cannot connect to server please try again later');
+        p.log.error('Cannot connect to server please try again later');
+        program.error('');
     }
     return createClient<Database>(config.supaHost, config.supaKey, {
         auth: {
@@ -88,53 +93,57 @@ export const createSupabaseClient = async (apikey: string) => {
 
 export const checkKey = async (supabase: SupabaseClient<Database>, apikey: string,
     keymode: Database['public']['Enums']['key_mode'][]) => {
-    const { data: apiAccess, error: apiAccessError } = await supabase
+    const { data: apiAccess} = await supabase
         .rpc('is_allowed_capgkey', { apikey, keymode })
         .single()
 
-    if (!apiAccess || apiAccessError) {
-        program.error(`Invalid API key or insufficient permissions ${formatError(apiAccessError)}`);
+    if (!apiAccess) {
+        p.log.error(`Invalid API key or insufficient permissions.`);
+        // create a string from keymode array with comma and space and "or" for the last one
+        const keymodeStr = keymode.map((k, i) => {
+            if (i === keymode.length - 1) {
+                return `or ${k}`
+            }
+            return `${k}, `
+        }).join('')
+        p.log.error(`Your key should be: ${keymodeStr} mode.`);
+        program.error('')
     }
 }
 
 export const isGoodPlan = async (supabase: SupabaseClient<Database>, userId: string): Promise<boolean> => {
-    const { data, error } = await supabase
+    const { data } = await supabase
         .rpc('is_good_plan_v3', { userid: userId })
         .single()
-    if (error) {
-        throw error
-    }
     return data || false
 }
 
 export const isPaying = async (supabase: SupabaseClient<Database>, userId: string): Promise<boolean> => {
-    const { data, error } = await supabase
+    const { data } = await supabase
         .rpc('is_paying', { userid: userId })
         .single()
-    if (error) {
-        throw error
-    }
     return data || false
 }
 
 export const isTrial = async (supabase: SupabaseClient<Database>, userId: string): Promise<number> => {
-    const { data, error } = await supabase
+    const { data } = await supabase
         .rpc('is_trial', { userid: userId })
         .single()
-    if (error) {
-        throw error
-    }
     return data || 0
 }
 
 export const isAllowedAction = async (supabase: SupabaseClient<Database>, userId: string): Promise<boolean> => {
-    const { data, error } = await supabase
+    const { data } = await supabase
         .rpc('is_allowed_action_user', { userid: userId })
         .single()
-    if (error) {
-        throw error
-    }
-    return data
+    return !!data
+}
+
+export const isAllowedApp = async (supabase: SupabaseClient<Database>, apikey: string, appId: string): Promise<boolean> => {
+    const { data } = await supabase
+        .rpc('is_allowed_action', { apikey, appid: appId })
+        .single()
+    return !!data
 }
 
 export const checkPlanValid = async (supabase: SupabaseClient<Database>, userId: string, warning = true) => {
@@ -173,8 +182,10 @@ export const findSavedKey = (quiet = false) => {
             p.log.info(`Use local apy key ${keyPath}`)
         key = readFileSync(keyPath, 'utf8').trim();
     }
-    if (!key)
-        program.error('Key not found, please login first');
+    if (!key) {
+        p.log.error(`Cannot find API key in local folder or global, please login first with npx @capacitor/cli login`);
+        program.error('')
+    }
     return key
 }
 
@@ -341,6 +352,7 @@ export const useLogSnag = (): LogSnag => {
 }
 
 export const convertAppName = (appName: string) => appName.replace(/\./g, '--')
+
 export const verifyUser = async (supabase: SupabaseClient<Database>, apikey: string,
     keymod: Database['public']['Enums']['key_mode'][] = ['all']) => {
     await checkKey(supabase, apikey, keymod);
@@ -352,7 +364,8 @@ export const verifyUser = async (supabase: SupabaseClient<Database>, apikey: str
     const userId = (dataUser || '').toString();
 
     if (!userId || userIdError) {
-        program.error(`Cannot verify user ${formatError(userIdError)}`);
+        p.log.error(`Cannot auth user with apikey`);
+        program.error('')
     }
     return userId;
 }

package/src/api/storage.ts

@@ -1,15 +0,0 @@
-import { SupabaseClient } from '@supabase/supabase-js';
-import { program } from 'commander';
-import { Database } from 'types/supabase.types';
-import { formatError } from '../utils';
-
-export const deleteFromStorage = async (supabase: SupabaseClient<Database>,
-  userId: string, appid: string, versionData: Database['public']['Tables']['app_versions']['Row'], bundle: string) => {
-  const { error: delError } = await supabase
-    .storage
-    .from('apps')
-    .remove([`${userId}/${appid}/versions/${versionData.bucket_id} `]);
-  if (delError) {
-    program.error(`Something went wrong when trying to delete ${appid} @${bundle} ${formatError(delError)} `);
-  }
-}

package/src/api/utils.ts

@@ -1,4 +0,0 @@
-
-export interface OptionsBase {
-    apikey: string;
-}