@capgo/cli 4.2.8 → 4.2.12

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.2.12](https://github.com/Cap-go/CLI/compare/v4.2.11...v4.2.12) (2024-03-29)
+
+
+### Bug Fixes
+
+* types issue ([ad9afa1](https://github.com/Cap-go/CLI/commit/ad9afa184f35863ba0d9f942bed133ee68e9661a))
+
+### [4.2.11](https://github.com/Cap-go/CLI/compare/v4.2.10...v4.2.11) (2024-03-25)
+
+### [4.2.10](https://github.com/Cap-go/CLI/compare/v4.2.9...v4.2.10) (2024-03-25)
+
+### [4.2.9](https://github.com/Cap-go/CLI/compare/v4.2.8...v4.2.9) (2024-03-23)
+
+
+### Bug Fixes
+
+* empty list issue ([dac8617](https://github.com/Cap-go/CLI/commit/dac86177c55c71bd3ad3bbbca7833ba30d461c33))
+
 ### [4.2.8](https://github.com/Cap-go/CLI/compare/v4.2.7...v4.2.8) (2024-03-23)
 
 ### [4.2.7](https://github.com/Cap-go/CLI/compare/v4.2.6...v4.2.7) (2024-03-23)

package/dist/index.js

@@ -61137,7 +61137,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.2.8",
+  version: "4.2.12",
   description: "A CLI to upload to capgo servers",
   main: "dist/index.js",
   bin: {
@@ -62621,8 +62621,8 @@ async function verifyUser(supabase, apikey, keymod = ["all"]) {
   }
   return userId;
 }
-async function requireUpdateMetadata(supabase, channel2) {
-  const { data, error } = await supabase.from("channels").select("disableAutoUpdate").eq("name", channel2).limit(1);
+async function requireUpdateMetadata(supabase, channel2, appId) {
+  const { data, error } = await supabase.from("channels").select("disableAutoUpdate").eq("name", channel2).eq("app_id", appId).limit(1);
   if (error) {
     f2.error(`Cannot check if disableAutoUpdate is required ${formatError(error)}`);
     program.error("");
@@ -63493,7 +63493,7 @@ async function uploadBundle(appid, options, shouldExit = true) {
   const userId = await verifyUser(supabase, options.apikey, ["write", "all", "upload"]);
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, 2 /* upload */);
   await checkPlanValid(supabase, userId, options.apikey, appid, true);
-  const updateMetadataRequired = await requireUpdateMetadata(supabase, channel2);
+  const updateMetadataRequired = await requireUpdateMetadata(supabase, channel2, appid);
   const { data: channelData, error: channelError } = await supabase.from("channels").select("version ( minUpdateVersion, native_packages )").eq("name", channel2).eq("app_id", appid).single();
   let localDependencies = void 0;
   let finalCompatibility;
@@ -64346,6 +64346,10 @@ async function deleteSpecificVersion(supabase, appid, _userId, bundle2) {
   await deleteAppVersion(supabase, appid, bundle2);
 }
 function displayBundles(data) {
+  if (!data.length) {
+    f2.error("No bundle found");
+    process.exit(1);
+  }
   const t = new import_console_table_printer2.Table({
     title: "Bundles",
     charLength: { "\u274C": 2, "\u2705": 2 }
@@ -64756,6 +64760,10 @@ async function currentBundle(channel2, appId, options) {
 var import_node_process25 = __toESM(require("node:process"));
 var import_console_table_printer3 = __toESM(require_dist18());
 function displayApp(data) {
+  if (!data.length) {
+    f2.error("No apps found");
+    import_node_process25.default.exit(1);
+  }
   const t = new import_console_table_printer3.Table({
     title: "Apps",
     charLength: { "\u274C": 2, "\u2705": 2 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.2.8",
+  "version": "4.2.12",
   "description": "A CLI to upload to capgo servers",
   "main": "dist/index.js",
   "bin": {

package/src/api/versions.ts

@@ -33,6 +33,11 @@ export async function deleteSpecificVersion(supabase: SupabaseClient<Database>,
 }
 
 export function displayBundles(data: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[]) {
+  if (!data.length) {
+    p.log.error('No bundle found')
+    // eslint-disable-next-line node/prefer-global/process
+    process.exit(1)
+  }
   const t = new Table({
     title: 'Bundles',
     charLength: { '❌': 2, '✅': 2 },

package/src/app/list.ts

@@ -9,6 +9,10 @@ import { createSupabaseClient, findSavedKey, getHumanDate, verifyUser } from '..
 import { checkLatest } from '../api/update'
 
 function displayApp(data: Database['public']['Tables']['apps']['Row'][]) {
+  if (!data.length) {
+    p.log.error('No apps found')
+    process.exit(1)
+  }
   const t = new Table({
     title: 'Apps',
     charLength: { '❌': 2, '✅': 2 },

package/src/bundle/upload.ts

@@ -121,7 +121,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.upload)
   await checkPlanValid(supabase, userId, options.apikey, appid, true)
 
-  const updateMetadataRequired = await requireUpdateMetadata(supabase, channel)
+  const updateMetadataRequired = await requireUpdateMetadata(supabase, channel, appid)
 
   // Check compatibility here
   const { data: channelData, error: channelError } = await supabase

package/src/types/supabase.types.ts

@@ -164,10 +164,12 @@ export interface Database {
           minUpdateVersion: string | null
           name: string
           native_packages: Json[] | null
+          owner_org: string
+          r2_path: string | null
           session_key: string | null
           storage_provider: string
           updated_at: string | null
-          user_id: string
+          user_id: string | null
         }
         Insert: {
           app_id: string
@@ -180,10 +182,12 @@ export interface Database {
           minUpdateVersion?: string | null
           name: string
           native_packages?: Json[] | null
+          owner_org: string
+          r2_path?: string | null
           session_key?: string | null
           storage_provider?: string
           updated_at?: string | null
-          user_id: string
+          user_id?: string | null
         }
         Update: {
           app_id?: string
@@ -196,10 +200,12 @@ export interface Database {
           minUpdateVersion?: string | null
           name?: string
           native_packages?: Json[] | null
+          owner_org?: string
+          r2_path?: string | null
           session_key?: string | null
           storage_provider?: string
           updated_at?: string | null
-          user_id?: string
+          user_id?: string | null
         }
         Relationships: [
           {
@@ -210,10 +216,10 @@ export interface Database {
             referencedColumns: ['app_id']
           },
           {
-            foreignKeyName: 'app_versions_user_id_fkey'
-            columns: ['user_id']
+            foreignKeyName: 'owner_org_id_fkey'
+            columns: ['owner_org']
             isOneToOne: false
-            referencedRelation: 'users'
+            referencedRelation: 'orgs'
             referencedColumns: ['id']
           },
         ]
@@ -227,10 +233,10 @@ export interface Database {
           fails: number | null
           id: number
           installs: number | null
+          owner_org: string
           size: number
           uninstalls: number | null
           updated_at: string | null
-          user_id: string
         }
         Insert: {
           app_id: string
@@ -240,10 +246,10 @@ export interface Database {
           fails?: number | null
           id?: number
           installs?: number | null
+          owner_org: string
           size: number
           uninstalls?: number | null
           updated_at?: string | null
-          user_id: string
         }
         Update: {
           app_id?: string
@@ -253,10 +259,10 @@ export interface Database {
           fails?: number | null
           id?: number
           installs?: number | null
+          owner_org?: string
           size?: number
           uninstalls?: number | null
           updated_at?: string | null
-          user_id?: string
         }
         Relationships: [
           {
@@ -274,10 +280,10 @@ export interface Database {
             referencedColumns: ['id']
           },
           {
-            foreignKeyName: 'app_versions_meta_user_id_fkey'
-            columns: ['user_id']
+            foreignKeyName: 'owner_org_id_fkey'
+            columns: ['owner_org']
             isOneToOne: false
-            referencedRelation: 'users'
+            referencedRelation: 'orgs'
             referencedColumns: ['id']
           },
         ]
@@ -290,9 +296,10 @@ export interface Database {
           id: string | null
           last_version: string | null
           name: string | null
+          owner_org: string
           retention: number
           updated_at: string | null
-          user_id: string
+          user_id: string | null
         }
         Insert: {
           app_id: string
@@ -301,9 +308,10 @@ export interface Database {
           id?: string | null
           last_version?: string | null
           name?: string | null
+          owner_org: string
           retention?: number
           updated_at?: string | null
-          user_id: string
+          user_id?: string | null
         }
         Update: {
           app_id?: string
@@ -312,9 +320,10 @@ export interface Database {
           id?: string | null
           last_version?: string | null
           name?: string | null
+          owner_org?: string
           retention?: number
           updated_at?: string | null
-          user_id?: string
+          user_id?: string | null
         }
         Relationships: [
           {
@@ -324,34 +333,53 @@ export interface Database {
             referencedRelation: 'users'
             referencedColumns: ['id']
           },
+          {
+            foreignKeyName: 'owner_org_id_fkey'
+            columns: ['owner_org']
+            isOneToOne: false
+            referencedRelation: 'orgs'
+            referencedColumns: ['id']
+          },
         ]
       }
+      auth_uid: {
+        Row: {
+          uid: string | null
+        }
+        Insert: {
+          uid?: string | null
+        }
+        Update: {
+          uid?: string | null
+        }
+        Relationships: []
+      }
       channel_devices: {
         Row: {
           app_id: string
           channel_id: number
           created_at: string | null
-          created_by: string
           device_id: string
           id: number
+          owner_org: string
           updated_at: string
         }
         Insert: {
           app_id: string
           channel_id: number
           created_at?: string | null
-          created_by: string
           device_id: string
           id?: number
+          owner_org: string
           updated_at?: string
         }
         Update: {
           app_id?: string
           channel_id?: number
           created_at?: string | null
-          created_by?: string
           device_id?: string
           id?: number
+          owner_org?: string
           updated_at?: string
         }
         Relationships: [
@@ -370,10 +398,10 @@ export interface Database {
             referencedColumns: ['id']
           },
           {
-            foreignKeyName: 'channel_devices_created_by_fkey'
-            columns: ['created_by']
+            foreignKeyName: 'owner_org_id_fkey'
+            columns: ['owner_org']
             isOneToOne: false
-            referencedRelation: 'users'
+            referencedRelation: 'orgs'
             referencedColumns: ['id']
           },
         ]
@@ -387,7 +415,7 @@ export interface Database {
           app_id: string
           beta: boolean
           created_at: string
-          created_by: string
+          created_by: string | null
           disableAutoUpdate: Database['public']['Enums']['disable_update']
           disableAutoUpdateUnderNative: boolean
           enable_progressive_deploy: boolean
@@ -395,6 +423,7 @@ export interface Database {
           id: number
           ios: boolean
           name: string
+          owner_org: string
           public: boolean
           secondaryVersionPercentage: number
           secondVersion: number | null
@@ -409,7 +438,7 @@ export interface Database {
           app_id: string
           beta?: boolean
           created_at?: string
-          created_by: string
+          created_by?: string | null
           disableAutoUpdate?: Database['public']['Enums']['disable_update']
           disableAutoUpdateUnderNative?: boolean
           enable_progressive_deploy?: boolean
@@ -417,6 +446,7 @@ export interface Database {
           id?: number
           ios?: boolean
           name: string
+          owner_org: string
           public?: boolean
           secondaryVersionPercentage?: number
           secondVersion?: number | null
@@ -431,7 +461,7 @@ export interface Database {
           app_id?: string
           beta?: boolean
           created_at?: string
-          created_by?: string
+          created_by?: string | null
           disableAutoUpdate?: Database['public']['Enums']['disable_update']
           disableAutoUpdateUnderNative?: boolean
           enable_progressive_deploy?: boolean
@@ -439,6 +469,7 @@ export interface Database {
           id?: number
           ios?: boolean
           name?: string
+          owner_org?: string
           public?: boolean
           secondaryVersionPercentage?: number
           secondVersion?: number | null
@@ -453,13 +484,6 @@ export interface Database {
             referencedRelation: 'apps'
             referencedColumns: ['app_id']
           },
-          {
-            foreignKeyName: 'channels_created_by_fkey'
-            columns: ['created_by']
-            isOneToOne: false
-            referencedRelation: 'users'
-            referencedColumns: ['id']
-          },
           {
             foreignKeyName: 'channels_secondVersion_fkey'
             columns: ['secondVersion']
@@ -474,6 +498,13 @@ export interface Database {
             referencedRelation: 'app_versions'
             referencedColumns: ['id']
           },
+          {
+            foreignKeyName: 'owner_org_id_fkey'
+            columns: ['owner_org']
+            isOneToOne: false
+            referencedRelation: 'orgs'
+            referencedColumns: ['id']
+          },
         ]
       }
       clickhouse_app_usage: {
@@ -515,6 +546,129 @@ export interface Database {
         }
         Relationships: []
       }
+      clickhouse_app_usage_parm: {
+        Row: {
+          _app_list: string | null
+          _end_date: string | null
+          _start_date: string | null
+          app_id: string | null
+          bandwidth: number | null
+          date: string | null
+          fail: number | null
+          get: number | null
+          install: number | null
+          mau: number | null
+          storage_added: number | null
+          storage_deleted: number | null
+          uninstall: number | null
+        }
+        Insert: {
+          _app_list?: string | null
+          _end_date?: string | null
+          _start_date?: string | null
+          app_id?: string | null
+          bandwidth?: number | null
+          date?: string | null
+          fail?: number | null
+          get?: number | null
+          install?: number | null
+          mau?: number | null
+          storage_added?: number | null
+          storage_deleted?: number | null
+          uninstall?: number | null
+        }
+        Update: {
+          _app_list?: string | null
+          _end_date?: string | null
+          _start_date?: string | null
+          app_id?: string | null
+          bandwidth?: number | null
+          date?: string | null
+          fail?: number | null
+          get?: number | null
+          install?: number | null
+          mau?: number | null
+          storage_added?: number | null
+          storage_deleted?: number | null
+          uninstall?: number | null
+        }
+        Relationships: []
+      }
+      clickhouse_devices: {
+        Row: {
+          app_id: string | null
+          created_at: string | null
+          custom_id: string | null
+          device_id: string | null
+          is_emulator: boolean | null
+          is_prod: boolean | null
+          os_version: string | null
+          platform: string | null
+          plugin_version: string | null
+          updated_at: string | null
+          version: number | null
+          version_build: string | null
+        }
+        Insert: {
+          app_id?: string | null
+          created_at?: string | null
+          custom_id?: string | null
+          device_id?: string | null
+          is_emulator?: boolean | null
+          is_prod?: boolean | null
+          os_version?: string | null
+          platform?: string | null
+          plugin_version?: string | null
+          updated_at?: string | null
+          version?: number | null
+          version_build?: string | null
+        }
+        Update: {
+          app_id?: string | null
+          created_at?: string | null
+          custom_id?: string | null
+          device_id?: string | null
+          is_emulator?: boolean | null
+          is_prod?: boolean | null
+          os_version?: string | null
+          platform?: string | null
+          plugin_version?: string | null
+          updated_at?: string | null
+          version?: number | null
+          version_build?: string | null
+        }
+        Relationships: []
+      }
+      clickhouse_logs: {
+        Row: {
+          action: string | null
+          app_id: string | null
+          created_at: string | null
+          device_id: string | null
+          platform: string | null
+          version: number | null
+          version_build: string | null
+        }
+        Insert: {
+          action?: string | null
+          app_id?: string | null
+          created_at?: string | null
+          device_id?: string | null
+          platform?: string | null
+          version?: number | null
+          version_build?: string | null
+        }
+        Update: {
+          action?: string | null
+          app_id?: string | null
+          created_at?: string | null
+          device_id?: string | null
+          platform?: string | null
+          version?: number | null
+          version_build?: string | null
+        }
+        Relationships: []
+      }
       cycle_info: {
         Row: {
           subscription_anchor_end: string | null
@@ -597,27 +751,27 @@ export interface Database {
         Row: {
           app_id: string
           created_at: string | null
-          created_by: string | null
           device_id: string
           id: number
+          owner_org: string
           updated_at: string | null
           version: number
         }
         Insert: {
           app_id: string
           created_at?: string | null
-          created_by?: string | null
           device_id: string
           id?: number
+          owner_org: string
           updated_at?: string | null
           version: number
         }
         Update: {
           app_id?: string
           created_at?: string | null
-          created_by?: string | null
           device_id?: string
           id?: number
+          owner_org?: string
           updated_at?: string | null
           version?: number
         }
@@ -630,17 +784,17 @@ export interface Database {
             referencedColumns: ['app_id']
           },
           {
-            foreignKeyName: 'devices_override_created_by_fkey'
-            columns: ['created_by']
+            foreignKeyName: 'devices_override_version_fkey'
+            columns: ['version']
             isOneToOne: false
-            referencedRelation: 'users'
+            referencedRelation: 'app_versions'
             referencedColumns: ['id']
           },
           {
-            foreignKeyName: 'devices_override_version_fkey'
-            columns: ['version']
+            foreignKeyName: 'owner_org_id_fkey'
+            columns: ['owner_org']
             isOneToOne: false
-            referencedRelation: 'app_versions'
+            referencedRelation: 'orgs'
             referencedColumns: ['id']
           },
         ]
@@ -966,105 +1120,6 @@ export interface Database {
         }
         Relationships: []
       }
-      store_apps: {
-        Row: {
-          app_id: string
-          capacitor: boolean
-          capgo: boolean
-          category: string
-          cordova: boolean
-          created_at: string | null
-          developer: string
-          developer_email: string
-          developer_id: string | null
-          error_get_framework: string
-          error_get_info: string
-          error_get_similar: string
-          flutter: boolean
-          free: boolean
-          icon: string
-          installs: number
-          kotlin: boolean
-          lang: string | null
-          native_script: boolean
-          onprem: boolean
-          react_native: boolean
-          score: number
-          summary: string
-          title: string
-          to_get_framework: boolean
-          to_get_info: boolean
-          to_get_similar: boolean
-          updated_at: string
-          updates: number
-          url: string
-        }
-        Insert: {
-          app_id: string
-          capacitor?: boolean
-          capgo?: boolean
-          category?: string
-          cordova?: boolean
-          created_at?: string | null
-          developer?: string
-          developer_email?: string
-          developer_id?: string | null
-          error_get_framework?: string
-          error_get_info?: string
-          error_get_similar?: string
-          flutter?: boolean
-          free?: boolean
-          icon?: string
-          installs?: number
-          kotlin?: boolean
-          lang?: string | null
-          native_script?: boolean
-          onprem?: boolean
-          react_native?: boolean
-          score?: number
-          summary?: string
-          title?: string
-          to_get_framework?: boolean
-          to_get_info?: boolean
-          to_get_similar?: boolean
-          updated_at?: string
-          updates?: number
-          url?: string
-        }
-        Update: {
-          app_id?: string
-          capacitor?: boolean
-          capgo?: boolean
-          category?: string
-          cordova?: boolean
-          created_at?: string | null
-          developer?: string
-          developer_email?: string
-          developer_id?: string | null
-          error_get_framework?: string
-          error_get_info?: string
-          error_get_similar?: string
-          flutter?: boolean
-          free?: boolean
-          icon?: string
-          installs?: number
-          kotlin?: boolean
-          lang?: string | null
-          native_script?: boolean
-          onprem?: boolean
-          react_native?: boolean
-          score?: number
-          summary?: string
-          title?: string
-          to_get_framework?: boolean
-          to_get_info?: boolean
-          to_get_similar?: boolean
-          updated_at?: string
-          updates?: number
-          url?: string
-        }
-        Relationships: []
-      }
       stripe_info: {
         Row: {
           created_at: string
@@ -1275,10 +1330,6 @@ export interface Database {
         }
         Returns: number
       }
-      count_all_apps: {
-        Args: Record<PropertyKey, never>
-        Returns: number
-      }
       count_all_need_upgrade: {
         Args: Record<PropertyKey, never>
         Returns: number
@@ -1309,10 +1360,6 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: number
       }
-      count_all_updates: {
-        Args: Record<PropertyKey, never>
-        Returns: number
-      }
       create_partitions: {
         Args: {
           start_date: string
@@ -1440,6 +1487,23 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: string
       }
+      get_identity:
+        | {
+          Args: Record<PropertyKey, never>
+          Returns: string
+        }
+        | {
+          Args: {
+            keymode: Database['public']['Enums']['key_mode'][]
+          }
+          Returns: string
+        }
+      get_identity_apikey_only: {
+        Args: {
+          keymode: Database['public']['Enums']['key_mode'][]
+        }
+        Returns: string
+      }
       get_infos: {
         Args: {
           appid: string
@@ -1491,6 +1555,7 @@ export interface Database {
           uid: string
           email: string
           image_url: string
+          role: Database['public']['Enums']['user_min_right']
         }[]
       }
       get_org_perm_for_apikey: {
@@ -1528,6 +1593,43 @@ export interface Database {
           is_canceled: boolean
         }[]
       }
+      get_orgs_v4:
+        | {
+          Args: Record<PropertyKey, never>
+          Returns: {
+            gid: string
+            created_by: string
+            logo: string
+            name: string
+            role: string
+            paying: boolean
+            trial_left: number
+            can_use_more: boolean
+            is_canceled: boolean
+            app_count: number
+            subscription_start: string
+            subscription_end: string
+          }[]
+        }
+        | {
+          Args: {
+            userid: string
+          }
+          Returns: {
+            gid: string
+            created_by: string
+            logo: string
+            name: string
+            role: string
+            paying: boolean
+            trial_left: number
+            can_use_more: boolean
+            is_canceled: boolean
+            app_count: number
+            subscription_start: string
+            subscription_end: string
+          }[]
+        }
       get_plan_usage_percent: {
         Args: {
           userid: string
@@ -1548,6 +1650,13 @@ export interface Database {
           }
           Returns: number
         }
+      get_total_app_storage_size_orgs: {
+        Args: {
+          org_id: string
+          app_id: string
+        }
+        Returns: number
+      }
       get_total_stats_v5: {
         Args: {
           userid: string
@@ -1582,6 +1691,12 @@ export interface Database {
           }
           Returns: number
         }
+      get_total_storage_size_org: {
+        Args: {
+          org_id: string
+        }
+        Returns: number
+      }
       get_usage_mode_and_last_saved: {
         Args: Record<PropertyKey, never>
         Returns: {
@@ -1632,6 +1747,14 @@ export interface Database {
         }
         Returns: boolean
       }
+      has_app_right_userid: {
+        Args: {
+          appid: string
+          right: Database['public']['Enums']['user_min_right']
+          userid: string
+        }
+        Returns: boolean
+      }
       has_min_right: {
         Args: {
           _userid: string
@@ -1656,13 +1779,6 @@ export interface Database {
         }
         Returns: number
       }
-      increment_store: {
-        Args: {
-          app_id: string
-          updates: number
-        }
-        Returns: undefined
-      }
       invite_user_to_org: {
         Args: {
           email: string
@@ -1948,10 +2064,12 @@ export interface Database {
         | 'invite_upload'
         | 'invite_write'
         | 'invite_admin'
+        | 'invite_super_admin'
         | 'read'
         | 'upload'
         | 'write'
         | 'admin'
+        | 'super_admin'
       user_role: 'read' | 'upload' | 'write' | 'admin'
     }
     CompositeTypes: {

package/src/utils.ts

@@ -498,11 +498,12 @@ export async function verifyUser(supabase: SupabaseClient<Database>, apikey: str
   return userId
 }
 
-export async function requireUpdateMetadata(supabase: SupabaseClient<Database>, channel: string): Promise<boolean> {
+export async function requireUpdateMetadata(supabase: SupabaseClient<Database>, channel: string, appId: string): Promise<boolean> {
   const { data, error } = await supabase
     .from('channels')
     .select('disableAutoUpdate')
     .eq('name', channel)
+    .eq('app_id', appId)
     .limit(1)
 
   if (error) {