@capgo/cli 4.10.2 → 4.10.6-beta.1

package/src/types/supabase.types.ts

@@ -15,6 +15,7 @@ export interface Database {
           id: number
           key: string
           mode: Database['public']['Enums']['key_mode']
+          name: string
           updated_at: string | null
           user_id: string
         }
@@ -23,6 +24,7 @@ export interface Database {
           id?: number
           key: string
           mode: Database['public']['Enums']['key_mode']
+          name: string
           updated_at?: string | null
           user_id: string
         }
@@ -31,6 +33,7 @@ export interface Database {
           id?: number
           key?: string
           mode?: Database['public']['Enums']['key_mode']
+          name?: string
           updated_at?: string | null
           user_id?: string
         }
@@ -411,129 +414,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 +549,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 +562,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 +575,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 +949,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 +1137,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 +1479,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 +1595,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: {
@@ -1773,6 +1641,27 @@ export interface Database {
         }
         Returns: string
       }
+      get_versions_with_no_metadata: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          app_id: string
+          bucket_id: string | null
+          checksum: string | null
+          created_at: string | null
+          deleted: boolean
+          external_url: string | null
+          id: number
+          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 | null
+        }[]
+      }
       get_weekly_stats: {
         Args: {
           app_id: string
@@ -1798,6 +1687,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 +1743,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: {
@@ -1962,6 +1838,10 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: number[]
       }
+      process_failed_uploads: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
       process_free_trial_expired: {
         Args: Record<PropertyKey, never>
         Returns: undefined
@@ -2061,6 +1941,50 @@ 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'
+        | 'uninstall'
+        | 'needPlanUpgrade'
+        | 'missingBundle'
+        | 'noNew'
+        | 'disablePlatformIos'
+        | 'disablePlatformAndroid'
+        | 'disableAutoUpdateToMajor'
+        | 'cannotUpdateViaPrivateChannel'
+        | 'disableAutoUpdateToMinor'
+        | 'disableAutoUpdateToPatch'
+        | 'channelMisconfigured'
+        | 'disableAutoUpdateMetadata'
+        | 'disableAutoUpdateUnderNative'
+        | 'disableDevBuild'
+        | 'disableEmulator'
+        | 'cannotGetBundle'
+        | 'checksum_fail'
+        | 'NoChannelOrOverride'
       stripe_status:
         | 'created'
         | 'succeeded'
@@ -2081,6 +2005,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

@@ -1,6 +1,6 @@
-import { existsSync, readFileSync, readdirSync } from 'node:fs'
+import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
 import { homedir } from 'node:os'
-import { resolve } from 'node:path'
+import { join, resolve, sep } from 'node:path'
 import process from 'node:process'
 import type { Buffer } from 'node:buffer'
 import { loadConfig } from '@capacitor/cli/dist/config'
@@ -15,6 +15,9 @@ import { promiseFiles } from 'node-dir'
 import { findRootSync } from '@manypkg/find-root'
 import type { InstallCommand, PackageManagerRunner, PackageManagerType } from '@capgo/find-package-manager'
 import { findInstallCommand, findPackageManagerRunner, findPackageManagerType } from '@capgo/find-package-manager'
+// import AdmZip from 'adm-zip'
+// import isWsl from 'is-wsl'
+import JSZip from 'jszip'
 import type { Database } from './types/supabase.types'
 
 export const baseKey = '.capgo_key'
@@ -27,7 +30,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 +77,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 +137,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 +322,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 +417,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 = ''
@@ -519,6 +519,46 @@ async function prepareMultipart(supabase: SupabaseClient<Database>, appId: strin
   }
 }
 
+export async function zipFile(filePath: string): Promise<Buffer> {
+  const zip = new JSZip()
+
+  // Helper function to recursively add files and folders to the ZIP archive
+  const addToZip = async (folderPath: string, zipPath: string) => {
+    const items = readdirSync(folderPath)
+
+    for (const item of items) {
+      const itemPath = join(folderPath, item)
+      const stats = statSync(itemPath)
+
+      if (stats.isFile()) {
+        const fileContent = await readFileSync(itemPath)
+        zip.file(join(zipPath, item).split(sep).join('/'), fileContent)
+      }
+      else if (stats.isDirectory()) {
+        await addToZip(itemPath, join(zipPath, item))
+      }
+    }
+  }
+
+  // Start adding files and folders to the ZIP archive
+  await addToZip(filePath, '')
+
+  // Generate the ZIP file as a Buffer
+  const zipBuffer = await zip.generateAsync({ type: 'nodebuffer', platform: 'UNIX' })
+  return zipBuffer
+}
+
+// export function zipFile(filePath: string) {
+//   //  if windows and not wsl then do error
+//   if (os.release().toLowerCase().includes('microsoft') && !isWsl) {
+//     p.log.error(`Windows powershell is not supported, please use WSL or a Linux distribution`)
+//     program.error('')
+//   }
+//   const zip = new AdmZip()
+//   zip.addLocalFolder(filePath)
+//   return zip.toBuffer()
+// }
+
 async function finishMultipartDownload(key: string, uploadId: string, url: string, parts: any[]) {
   const metadata = {
     action: 'mpu-complete',
@@ -537,8 +577,19 @@ async function finishMultipartDownload(key: string, uploadId: string, url: strin
 }
 
 const PART_SIZE = 10 * 1024 * 1024
-export async function uploadMultipart(supabase: SupabaseClient<Database>, appId: string, name: string, data: Buffer): Promise<boolean> {
+export async function uploadMultipart(supabase: SupabaseClient<Database>, appId: string, name: string, data: Buffer, orgId: string): Promise<boolean> {
   try {
+    const snag = useLogSnag()
+    await snag.track({
+      channel: 'app',
+      event: 'App Multipart Prepare',
+      icon: '⏫',
+      user_id: orgId,
+      tags: {
+        'app-id': appId,
+      },
+      notify: false,
+    }).catch()
     const multipartPrep = await prepareMultipart(supabase, appId, name)
     if (!multipartPrep) {
       // Just pass the error
@@ -555,6 +606,16 @@ export async function uploadMultipart(supabase: SupabaseClient<Database>, appId:
 
     await finishMultipartDownload(multipartPrep.key, multipartPrep.uploadId, multipartPrep.url, parts)
 
+    await snag.track({
+      channel: 'app',
+      event: 'App Multipart done',
+      icon: '⏫',
+      user_id: orgId,
+      tags: {
+        'app-id': appId,
+      },
+      notify: false,
+    }).catch()
     return true
   }
   catch (e) {
@@ -571,7 +632,7 @@ export async function deletedFailedVersion(supabase: SupabaseClient<Database>, a
   try {
     const pathFailed = 'private/delete_failed_version'
     const res = await supabase.functions.invoke(pathFailed, { body: JSON.stringify(data), method: 'DELETE' })
-    return res.data.url
+    return res.data.status
   }
   catch (error) {
     p.log.error(`Cannot delete failed version ${formatError(error)}`)

package/test/VerifyZip.java

@@ -0,0 +1,83 @@
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class VerifyZip {
+    public static void main(String[] args) {
+        if (args.length < 1) {
+            System.out.println("Usage: java VerifyZip <zip-file>");
+            System.exit(1);
+        }
+
+        String zipFilePath = args[0];
+        File zipFile = new File(zipFilePath);
+        File targetDirectory = new File("extracted");
+
+        if (!zipFile.exists()) {
+            System.out.println("File not found: " + zipFilePath);
+            System.exit(1);
+        }
+
+        try (
+            BufferedInputStream bis = new BufferedInputStream(new FileInputStream(zipFile));
+            ZipInputStream zis = new ZipInputStream(bis)
+        ) {
+            int count;
+            int bufferSize = 8192;
+            byte[] buffer = new byte[bufferSize];
+            long lengthTotal = zipFile.length();
+            long lengthRead = bufferSize;
+            int percent = 0;
+
+            ZipEntry entry;
+            while ((entry = zis.getNextEntry()) != null) {
+                if (entry.getName().contains("\\")) {
+                    System.out.println("Windows path is not supported: " + entry.getName());
+                    System.exit(1);
+                }
+                File file = new File(targetDirectory, entry.getName());
+                String canonicalPath = file.getCanonicalPath();
+                String canonicalDir = targetDirectory.getCanonicalPath();
+                File dir = entry.isDirectory() ? file : file.getParentFile();
+
+                if (!canonicalPath.startsWith(canonicalDir)) {
+                    System.out.println("SecurityException, Failed to ensure directory is the start path: " +
+                            canonicalDir + " of " + canonicalPath);
+                    System.exit(1);
+                }
+
+                if (!dir.isDirectory() && !dir.mkdirs()) {
+                    System.out.println("Failed to ensure directory: " + dir.getAbsolutePath());
+                    System.exit(1);
+                }
+
+                if (entry.isDirectory()) {
+                    continue;
+                }
+
+                try (FileOutputStream outputStream = new FileOutputStream(file)) {
+                    while ((count = zis.read(buffer)) != -1) {
+                        outputStream.write(buffer, 0, count);
+                    }
+                }
+
+                int newPercent = (int) ((lengthRead / (float) lengthTotal) * 100);
+                if (lengthTotal > 1 && newPercent != percent) {
+                    percent = newPercent;
+                }
+
+                lengthRead += entry.getCompressedSize();
+            }
+            System.out.println("ZIP file is valid: " + zipFilePath);
+        } catch (IOException e) {
+            System.out.println("Failed to process ZIP file: " + zipFilePath);
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+}