@capgo/cli 4.10.7 → 4.10.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.10.7",
+  "version": "4.10.10",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",
@@ -43,20 +43,20 @@
     "lint": "eslint \"src/**/*.ts\" --fix"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.574.0",
+    "@aws-sdk/client-s3": "^3.588.0",
     "@capacitor/cli": "6.0.0",
     "@capgo/find-package-manager": "^0.0.17",
     "@clack/prompts": "^0.7.0",
     "@manypkg/find-root": "^2.2.1",
-    "@supabase/supabase-js": "^2.43.1",
+    "@supabase/supabase-js": "^2.43.4",
     "@tomasklaen/checksum": "^1.1.0",
     "@trufflesuite/spinnies": "^0.1.1",
-    "adm-zip": "^0.5.12",
+    "adm-zip": "^0.5.13",
     "ci-info": "^4.0.0",
-    "commander": "12.0.0",
+    "commander": "12.1.0",
     "console-table-printer": "^2.12.0",
     "get-latest-version": "^5.1.0",
-    "ky": "^1.2.4",
+    "ky": "^1.3.0",
     "logsnag": "1.0.0",
     "mime": "^4.0.3",
     "node-dir": "^0.1.17",
@@ -66,19 +66,19 @@
     "semver": "^7.6.2"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.17.0",
+    "@antfu/eslint-config": "^2.20.0",
     "@types/adm-zip": "0.5.5",
     "@types/mime": "^4.0.0",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.14.0",
     "@types/node-dir": "^0.0.37",
     "@types/npmcli__ci-detect": "^2.0.3",
     "@types/prettyjson": "^0.0.33",
     "@types/prompt-sync": "^4.2.3",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
-    "esbuild": "^0.21.2",
-    "eslint": "9.1.1",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
+    "esbuild": "^0.21.4",
+    "eslint": "9.4.0",
     "git-format-staged": "3.1.1",
     "husky": "^9.0.11",
     "pkg": "5.8.1",

package/src/bundle/upload.ts

@@ -8,7 +8,7 @@ import { program } from 'commander'
 import * as p from '@clack/prompts'
 import { checksum as getChecksum } from '@tomasklaen/checksum'
 import ciDetect from 'ci-info'
-import ky from 'ky'
+import ky, { HTTPError } from 'ky'
 import {
   PutObjectCommand,
   S3Client,
@@ -395,7 +395,6 @@ It will be also visible in your dashboard\n`)
           p.log.error(`Cannot get upload url`)
           program.error('')
         }
-
         await ky.put(url, {
           timeout: options.timeout || UPLOAD_TIMEOUT,
           retry: 5,
@@ -415,6 +414,11 @@ It will be also visible in your dashboard\n`)
       const uploadTime = ((endTime - startTime) / 1000).toFixed(2)
       spinner.stop(`Failed to upload bundle ( after ${uploadTime} seconds)`)
       p.log.error(`Cannot upload bundle ${formatError(errorUpload)}`)
+      if (errorUpload instanceof HTTPError) {
+        const body = await errorUpload.response.text()
+        p.log.error(`Response: ${formatError(body)}`)
+        program.error('')
+      }
       // call delete version on path /delete_failed_version to delete the version
       await deletedFailedVersion(supabase, appid, bundle)
       program.error('')

package/src/types/supabase.types.ts

@@ -411,129 +411,6 @@ export interface Database {
           },
         ]
       }
-      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: []
-      }
       daily_bandwidth: {
         Row: {
           app_id: string
@@ -669,13 +546,12 @@ export interface Database {
       devices: {
         Row: {
           app_id: string
-          created_at: string
           custom_id: string
           device_id: string
           is_emulator: boolean | null
           is_prod: boolean | null
           os_version: string | null
-          platform: Database['public']['Enums']['platform_os'] | null
+          platform: Database['public']['Enums']['platform_os']
           plugin_version: string
           updated_at: string
           version: number
@@ -683,13 +559,12 @@ export interface Database {
         }
         Insert: {
           app_id: string
-          created_at: string
           custom_id?: string
           device_id: string
           is_emulator?: boolean | null
           is_prod?: boolean | null
           os_version?: string | null
-          platform?: Database['public']['Enums']['platform_os'] | null
+          platform: Database['public']['Enums']['platform_os']
           plugin_version?: string
           updated_at: string
           version: number
@@ -697,13 +572,12 @@ export interface Database {
         }
         Update: {
           app_id?: string
-          created_at?: string
           custom_id?: string
           device_id?: string
           is_emulator?: boolean | null
           is_prod?: boolean | null
           os_version?: string | null
-          platform?: Database['public']['Enums']['platform_os'] | null
+          platform?: Database['public']['Enums']['platform_os']
           plugin_version?: string
           updated_at?: string
           version?: number
@@ -1072,31 +946,25 @@ export interface Database {
       }
       stats: {
         Row: {
-          action: string
+          action: Database['public']['Enums']['stats_action']
           app_id: string
           created_at: string
           device_id: string
-          platform: Database['public']['Enums']['platform_os']
           version: number
-          version_build: string
         }
         Insert: {
-          action: string
+          action: Database['public']['Enums']['stats_action']
           app_id: string
           created_at: string
           device_id: string
-          platform: Database['public']['Enums']['platform_os']
           version: number
-          version_build: string
         }
         Update: {
-          action?: string
+          action?: Database['public']['Enums']['stats_action']
           app_id?: string
           created_at?: string
           device_id?: string
-          platform?: Database['public']['Enums']['platform_os']
           version?: number
-          version_build?: string
         }
         Relationships: []
       }
@@ -1266,19 +1134,19 @@ export interface Database {
       }
       version_usage: {
         Row: {
-          action: string
+          action: Database['public']['Enums']['version_action']
           app_id: string
           timestamp: string
           version_id: number
         }
         Insert: {
-          action: string
+          action: Database['public']['Enums']['version_action']
           app_id: string
           timestamp?: string
           version_id: number
         }
         Update: {
-          action?: string
+          action?: Database['public']['Enums']['version_action']
           app_id?: string
           timestamp?: string
           version_id?: number
@@ -1608,6 +1476,13 @@ export interface Database {
           role: Database['public']['Enums']['user_min_right']
         }[]
       }
+      get_org_owner_id: {
+        Args: {
+          apikey: string
+          app_id: string
+        }
+        Returns: string
+      }
       get_org_perm_for_apikey: {
         Args: {
           apikey: string
@@ -1717,16 +1592,6 @@ export interface Database {
             uninstall: number
           }[]
         }
-      get_total_stats_v5_org: {
-        Args: {
-          orgid: string
-        }
-        Returns: {
-          mau: number
-          bandwidth: number
-          storage: number
-        }[]
-      }
       get_total_storage_size:
         | {
           Args: {
@@ -1798,6 +1663,14 @@ export interface Database {
         }
         Returns: boolean
       }
+      http_post_helper: {
+        Args: {
+          function_name: string
+          function_type: string
+          body: Json
+        }
+        Returns: number
+      }
       invite_user_to_org: {
         Args: {
           email: string
@@ -1846,27 +1719,6 @@ export interface Database {
           }
           Returns: boolean
         }
-        | {
-          Args: {
-            apikey: string
-            keymode: Database['public']['Enums']['key_mode'][]
-            app_id: string
-            channel_id: number
-            right: Database['public']['Enums']['user_min_right']
-            user_id: string
-          }
-          Returns: boolean
-        }
-        | {
-          Args: {
-            apikey: string
-            keymode: Database['public']['Enums']['key_mode'][]
-            app_id: string
-            right: Database['public']['Enums']['user_min_right']
-            user_id: string
-          }
-          Returns: boolean
-        }
       is_app_owner:
         | {
           Args: {
@@ -2061,6 +1913,32 @@ export interface Database {
       pay_as_you_go_type: 'base' | 'units'
       platform_os: 'ios' | 'android'
       queue_job_status: 'inserted' | 'requested' | 'failed'
+      stats_action:
+        | 'delete'
+        | 'reset'
+        | 'set'
+        | 'get'
+        | 'set_fail'
+        | 'update_fail'
+        | 'download_fail'
+        | 'windows_path_fail'
+        | 'canonical_path_fail'
+        | 'directory_path_fail'
+        | 'unzip_fail'
+        | 'low_mem_fail'
+        | 'download_10'
+        | 'download_20'
+        | 'download_30'
+        | 'download_40'
+        | 'download_50'
+        | 'download_60'
+        | 'download_70'
+        | 'download_80'
+        | 'download_90'
+        | 'download_complete'
+        | 'decrypt_fail'
+        | 'app_moved_to_foreground'
+        | 'app_moved_to_background'
       stripe_status:
         | 'created'
         | 'succeeded'
@@ -2081,6 +1959,7 @@ export interface Database {
         | 'admin'
         | 'super_admin'
       user_role: 'read' | 'upload' | 'write' | 'admin'
+      version_action: 'get' | 'fail' | 'install' | 'uninstall'
     }
     CompositeTypes: {
       match_plan: {

package/src/utils.ts

@@ -27,7 +27,7 @@ export type ArrayElement<ArrayType extends readonly unknown[]> =
   ArrayType extends readonly (infer ElementType)[] ? ElementType : never
 export type Organization = ArrayElement<Database['public']['Functions']['get_orgs_v5']['Returns']>
 
-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 const regexSemver = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-z-][0-9a-z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-z-][0-9a-z-]*))*))?(?:\+([0-9a-z-]+(?:\.[0-9a-z-]+)*))?$/i
 export const formatError = (error: any) => error ? `\n${prettyjson.render(error)}` : ''
 
 export interface OptionsBase {
@@ -74,7 +74,7 @@ export async function getLocalConfig() {
     }
   }
 }
-
+// eslint-disable-next-line regexp/no-unused-capturing-group
 const nativeFileRegex = /([A-Za-z0-9]+)\.(java|swift|kt|scala)$/
 
 interface CapgoConfig {
@@ -134,13 +134,6 @@ export async function checkKey(supabase: SupabaseClient<Database>, apikey: strin
   }
 }
 
-export async function isGoodPlan(supabase: SupabaseClient<Database>, userId: string): Promise<boolean> {
-  const { data } = await supabase
-    .rpc('is_good_plan_v5', { userid: userId })
-    .single()
-  return data || false
-}
-
 export async function isPayingOrg(supabase: SupabaseClient<Database>, orgId: string): Promise<boolean> {
   const { data } = await supabase
     .rpc('is_paying_org', { orgid: orgId })
@@ -326,10 +319,13 @@ async function* getFiles(dir: string): AsyncGenerator<string> {
     if (dirent.isDirectory()
       && !dirent.name.startsWith('.')
       && !dirent.name.startsWith('node_modules')
-      && !dirent.name.startsWith('dist'))
+      && !dirent.name.startsWith('dist')) {
       yield * getFiles(res)
-    else
+    }
+
+    else {
       yield res
+    }
   }
 }
 
@@ -418,6 +414,7 @@ export async function findBuildCommandForProjectType(projectType: string) {
 }
 
 export async function findMainFile() {
+  // eslint-disable-next-line regexp/no-unused-capturing-group
   const mainRegex = /(main|index)\.(ts|tsx|js|jsx)$/
   // search for main.ts or main.js in local dir and subdirs
   let mainFile = ''