@capgo/cli 4.10.11 → 4.10.13

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.10.13](https://github.com/Cap-go/CLI/compare/v4.10.12...v4.10.13) (2024-06-08)
+
+
+### Bug Fixes
+
+* image upload ([cc42ebf](https://github.com/Cap-go/CLI/commit/cc42ebf8b297119383d5e08a73416515218bdbae))
+
+### [4.10.12](https://github.com/Cap-go/CLI/compare/v4.10.11...v4.10.12) (2024-06-07)
+
+
+### Bug Fixes
+
+* add back debug command ([bb220a3](https://github.com/Cap-go/CLI/commit/bb220a3c42d30397f67d78233d6b8be460674a23))
+
 ### [4.10.11](https://github.com/Cap-go/CLI/compare/v4.10.10...v4.10.11) (2024-06-05)
 
 

package/dist/index.js

@@ -110508,7 +110508,7 @@ async function getUserId(options) {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.10.11",
+  version: "4.10.13",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -110827,21 +110827,28 @@ async function cancelCommand(channel2, command, orgId, snag) {
     import_node_process10.default.exit();
   }
 }
-async function getStats(supabase, query) {
+async function getStats(apikey, query, after) {
   try {
-    const pathStats = "private/stats";
-    const res = await supabase.functions.invoke(pathStats, { body: JSON.stringify(query) });
-    const listData = res.data.data;
-    if (listData?.length > 0)
-      return listData[0];
+    const defaultApiHostPreprod = "https://api-preprod.capgo.app";
+    const dataD = await distribution_default.post(`${defaultApiHostPreprod}/private/stats`, {
+      headers: {
+        "Content-Type": "application/json",
+        "capgkey": apikey
+      },
+      body: JSON.stringify(query)
+    }).then((res) => res.json()).catch((err) => {
+      console.error("Cannot get devices", err);
+      return [];
+    });
+    if (dataD?.length > 0 && (after === null || after !== dataD[0].created_at))
+      return dataD[0];
   } catch (error) {
     f2.error(`Cannot get stats ${formatError(error)}`);
   }
   return null;
 }
-async function waitLog(channel2, supabase, appId, snag, orgId, deviceId) {
+async function waitLog(channel2, apikey, appId, snag, orgId, deviceId) {
   let loop = true;
-  let now = (/* @__PURE__ */ new Date()).toISOString();
   const appIdUrl = convertAppName(appId);
   const config = await getLocalConfig();
   const baseUrl = `${config.hostWeb}/app/p/${appIdUrl}`;
@@ -110853,13 +110860,14 @@ async function waitLog(channel2, supabase, appId, snag, orgId, deviceId) {
       key: "created_at",
       sortable: "desc"
     }],
-    rangeStart: 0,
-    rangeEnd: 1,
-    after: now
+    limit: 1,
+    rangeStart: (/* @__PURE__ */ new Date()).toISOString()
   };
+  let after = null;
   while (loop) {
-    const data = await getStats(supabase, query);
+    const data = await getStats(apikey, query, after);
     if (data) {
+      after = data.created_at;
       f2.info(`Log from Device: ${data.device_id}`);
       if (data.action === "get") {
         f2.info("Update Sent your your device, wait until event download complete");
@@ -110887,7 +110895,7 @@ async function waitLog(channel2, supabase, appId, snag, orgId, deviceId) {
       } else if (data.action === "missingBundle") {
         f2.error("Your bundle is missing, please check how you build your app ");
       } else if (data.action === "noNew") {
-        f2.error(`Your version in ${data.platform} is the same as your version uploaded, change it to see the update`);
+        f2.error(`Your version in ${data.device_id} is the same as your version uploaded, change it to see the update`);
       } else if (data.action === "disablePlatformIos") {
         f2.error(`iOS is disabled  in the default channel and your device is an iOS device ${baseUrl}`);
       } else if (data.action === "disablePlatformAndroid") {
@@ -110919,10 +110927,8 @@ async function waitLog(channel2, supabase, appId, snag, orgId, deviceId) {
       } else {
         f2.error(`Log from Capgo ${data.action}`);
       }
-      now = (/* @__PURE__ */ new Date()).toISOString();
-      query.after = now;
     }
-    await wait2(1e3);
+    await wait2(5e3);
   }
   return Promise.resolve();
 }
@@ -110951,8 +110957,8 @@ async function debugApp(appId, options) {
   await cancelCommand("debug", doRun, userId, snag);
   if (doRun) {
     f2.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`);
-    f2.info("Waiting...");
-    await waitLog("debug", supabase, appId, snag, orgId, deviceId);
+    f2.info("Waiting... (there is a usual delay of 15 seconds until the backend process the logs)");
+    await waitLog("debug", options.apikey, appId, snag, orgId, deviceId);
     $e(`Done \u2705`);
   } else {
     $e(`Canceled \u274C`);
@@ -111862,7 +111868,7 @@ async function addAppInternal(appId, options, organization, throwErr = true) {
     program.error("");
   }
   const supabase = await createSupabaseClient(options.apikey);
-  const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
+  await verifyUser(supabase, options.apikey, ["write", "all"]);
   const appExist = await checkAppExists(supabase, appId);
   if (appExist) {
     f2.error(`App ${appId} already exist`);
@@ -111908,7 +111914,7 @@ async function addAppInternal(appId, options, organization, throwErr = true) {
       f2.error(`Could not add app ${formatError(error)}`);
       program.error("");
     }
-    const { data: signedURLData } = await supabase.storage.from(`images/${userId}/${appId}`).getPublicUrl(fileName);
+    const { data: signedURLData } = await supabase.storage.from(`images/org/${organizationUid}/${appId}`).getPublicUrl(fileName);
     signedURL = signedURLData?.publicUrl || signedURL;
   }
   const { error: dbError } = await supabase.from("apps").insert({
@@ -112185,6 +112191,19 @@ async function step9(orgId, snag) {
   }
   await markStep(orgId, snag, 9);
 }
+async function step10(orgId, snag, apikey, appId) {
+  const doRun = await se({ message: `Automatic check if update working in device ?` });
+  await cancelCommand2(doRun, orgId, snag);
+  if (doRun) {
+    f2.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`);
+    f2.info("Waiting... (there is a usual delay of 15 seconds until the backend process the logs)");
+    await waitLog("onboarding-v2", apikey, appId, snag, orgId);
+  } else {
+    const appIdUrl = convertAppName(appId);
+    f2.info(`Check logs in https://web.capgo.app/app/p/${appIdUrl}/logs to see if update works.`);
+  }
+  await markStep(orgId, snag, 10);
+}
 async function initApp(apikeyCommand, appId, options) {
   const pm2 = getPMAndCommand();
   oe(`Capgo onboarding \u{1F6EB}`);
@@ -112212,6 +112231,7 @@ async function initApp(apikeyCommand, appId, options) {
   await step7(orgId, snag, apikey, appId);
   await step8(orgId, snag, apikey, appId);
   await step9(orgId, snag);
+  await step10(orgId, snag, apikey, appId);
   await markStep(orgId, snag, 0);
   f2.info(`Welcome onboard \u2708\uFE0F!`);
   f2.info(`Your Capgo update system is setup`);
@@ -112906,6 +112926,8 @@ async function setApp(appId, options) {
     program.error(``);
   }
   const supabase = await createSupabaseClient(options.apikey);
+  const organization = await getOrganization(supabase, ["admin", "super_admin"]);
+  const organizationUid = organization.gid;
   const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 4 /* admin */);
   const { name, icon, retention } = options;
@@ -112934,14 +112956,14 @@ async function setApp(appId, options) {
     f2.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`);
   }
   if (iconBuff && iconType) {
-    const { error } = await supabase.storage.from(`images/${userId}/${appId}`).upload(fileName, iconBuff, {
+    const { error } = await supabase.storage.from(`images/org/${organizationUid}/${appId}`).upload(fileName, iconBuff, {
       contentType: iconType
     });
     if (error) {
       f2.error(`Could not set app ${formatError(error)}`);
       program.error(``);
     }
-    const { data: signedURLData } = await supabase.storage.from(`images/${userId}/${appId}`).getPublicUrl(fileName);
+    const { data: signedURLData } = await supabase.storage.from(`images/org/${organizationUid}/${appId}`).getPublicUrl(fileName);
     signedURL = signedURLData?.publicUrl || signedURL;
   }
   const { error: dbError } = await supabase.from("apps").update({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.10.11",
+  "version": "4.10.13",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",

package/src/app/add.ts

@@ -48,7 +48,7 @@ export async function addAppInternal(appId: string, options: Options, organizati
 
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  await verifyUser(supabase, options.apikey, ['write', 'all'])
 
   // Check we have app access to this appId
   const appExist = await checkAppExists(supabase, appId)
@@ -111,7 +111,7 @@ export async function addAppInternal(appId: string, options: Options, organizati
     }
     const { data: signedURLData } = await supabase
       .storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .getPublicUrl(fileName)
     signedURL = signedURLData?.publicUrl || signedURL
   }

package/src/app/debug.ts

@@ -1,6 +1,6 @@
 import process from 'node:process'
+import ky from 'ky'
 import * as p from '@clack/prompts'
-import type { SupabaseClient } from '@supabase/supabase-js'
 import { program } from 'commander'
 import type LogSnag from 'logsnag'
 import type { Database } from '../types/supabase.types'
@@ -46,18 +46,36 @@ interface QueryStats {
   devicesId?: string[]
   search?: string
   order?: Order[]
-  rangeStart?: number
-  rangeEnd?: number
-  after?: string
+  rangeStart?: string
+  rangeEnd?: string
+  limit?: number
 }
-
-export async function getStats(supabase: SupabaseClient<Database>, query: QueryStats): Promise<Database['public']['Tables']['stats']['Row'] | null> {
+interface LogData {
+  app_id: string
+  device_id: string
+  action: Database['public']['Enums']['stats_action']
+  version_id: number
+  version?: number
+  created_at: string
+}
+export async function getStats(apikey: string, query: QueryStats, after: string | null): Promise<LogData | null> {
   try {
-    const pathStats = 'private/stats'
-    const res = await supabase.functions.invoke(pathStats, { body: JSON.stringify(query) })
-    const listData = res.data.data as Database['public']['Tables']['stats']['Row'][]
-    if (listData?.length > 0)
-      return listData[0]
+    const defaultApiHostPreprod = 'https://api-preprod.capgo.app'
+    const dataD = await ky
+      .post(`${defaultApiHostPreprod}/private/stats`, {
+        headers: {
+          'Content-Type': 'application/json',
+          'capgkey': apikey,
+        },
+        body: JSON.stringify(query),
+      })
+      .then(res => res.json<LogData[]>())
+      .catch((err) => {
+        console.error('Cannot get devices', err)
+        return [] as LogData[]
+      })
+    if (dataD?.length > 0 && (after === null || after !== dataD[0].created_at))
+      return dataD[0]
   }
   catch (error) {
     p.log.error(`Cannot get stats ${formatError(error)}`)
@@ -65,9 +83,8 @@ export async function getStats(supabase: SupabaseClient<Database>, query: QueryS
   return null
 }
 
-export async function waitLog(channel: string, supabase: SupabaseClient<Database>, appId: string, snag: LogSnag, orgId: string, deviceId?: string) {
+export async function waitLog(channel: string, apikey: string, appId: string, snag: LogSnag, orgId: string, deviceId?: string) {
   let loop = true
-  let now = new Date().toISOString()
   const appIdUrl = convertAppName(appId)
   const config = await getLocalConfig()
   const baseUrl = `${config.hostWeb}/app/p/${appIdUrl}`
@@ -79,14 +96,14 @@ export async function waitLog(channel: string, supabase: SupabaseClient<Database
       key: 'created_at',
       sortable: 'desc',
     }],
-    rangeStart: 0,
-    rangeEnd: 1,
-    after: now,
+    limit: 1,
+    rangeStart: new Date().toISOString(),
   }
+  let after: string | null = null
   while (loop) {
-    const data = await getStats(supabase, query)
-    //   console.log('data', data)
+    const data = await getStats(apikey, query, after)
     if (data) {
+      after = data.created_at
       p.log.info(`Log from Device: ${data.device_id}`)
       if (data.action === 'get') {
         p.log.info('Update Sent your your device, wait until event download complete')
@@ -122,7 +139,7 @@ export async function waitLog(channel: string, supabase: SupabaseClient<Database
         p.log.error('Your bundle is missing, please check how you build your app ')
       }
       else if (data.action === 'noNew') {
-        p.log.error(`Your version in ${data.platform} is the same as your version uploaded, change it to see the update`)
+        p.log.error(`Your version in ${data.device_id} is the same as your version uploaded, change it to see the update`)
       }
       else if (data.action === 'disablePlatformIos') {
         p.log.error(`iOS is disabled  in the default channel and your device is an iOS device ${baseUrl}`)
@@ -166,10 +183,8 @@ export async function waitLog(channel: string, supabase: SupabaseClient<Database
       else {
         p.log.error(`Log from Capgo ${data.action}`)
       }
-      now = new Date().toISOString()
-      query.after = now
     }
-    await wait(1000)
+    await wait(5000)
   }
   return Promise.resolve()
 }
@@ -208,8 +223,8 @@ export async function debugApp(appId: string, options: OptionsBaseDebug) {
   await cancelCommand('debug', doRun, userId, snag)
   if (doRun) {
     p.log.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`)
-    p.log.info('Waiting...')
-    await waitLog('debug', supabase, appId, snag, orgId, deviceId)
+    p.log.info('Waiting... (there is a usual delay of 15 seconds until the backend process the logs)')
+    await waitLog('debug', options.apikey, appId, snag, orgId, deviceId)
     p.outro(`Done ✅`)
   }
   else {

package/src/app/delete.ts

@@ -73,6 +73,7 @@ export async function deleteApp(appId: string, options: OptionsBase) {
     p.log.error('Could not delete app logo')
   }
 
+  // TODO: make the version delete in R2 too
   const { error: delError } = await supabase
     .storage
     .from(`apps/${appId}/${userId}`)

package/src/app/set.ts

@@ -6,7 +6,7 @@ import { program } from 'commander'
 import * as p from '@clack/prompts'
 import type { Options } from '../api/app'
 import { checkAppExistsAndHasPermissionOrgErr, newIconPath } from '../api/app'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganization, verifyUser } from '../utils'
 
 export async function setApp(appId: string, options: Options) {
   p.intro(`Set app`)
@@ -23,6 +23,8 @@ export async function setApp(appId: string, options: Options) {
     program.error(``)
   }
   const supabase = await createSupabaseClient(options.apikey)
+  const organization = await getOrganization(supabase, ['admin', 'super_admin'])
+  const organizationUid = organization.gid
 
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
@@ -61,7 +63,7 @@ export async function setApp(appId: string, options: Options) {
   }
   if (iconBuff && iconType) {
     const { error } = await supabase.storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .upload(fileName, iconBuff, {
         contentType: iconType,
       })
@@ -71,7 +73,7 @@ export async function setApp(appId: string, options: Options) {
     }
     const { data: signedURLData } = await supabase
       .storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .getPublicUrl(fileName)
     signedURL = signedURLData?.publicUrl || signedURL
   }

package/src/init.ts

@@ -3,10 +3,8 @@ import type { ExecSyncOptions } from 'node:child_process'
 import { execSync, spawnSync } from 'node:child_process'
 import process from 'node:process'
 import * as p from '@clack/prompts'
-import type { SupabaseClient } from '@supabase/supabase-js'
 import type LogSnag from 'logsnag'
 import semver from 'semver'
-import type { Database } from './types/supabase.types'
 import { markSnag, waitLog } from './app/debug'
 import { createKey } from './key'
 import { addChannel } from './channel/add'
@@ -284,13 +282,13 @@ async function step9(orgId: string, snag: LogSnag) {
   await markStep(orgId, snag, 9)
 }
 
-async function _step10(orgId: string, snag: LogSnag, supabase: SupabaseClient<Database>, appId: string) {
+async function step10(orgId: string, snag: LogSnag, apikey: string, appId: string) {
   const doRun = await p.confirm({ message: `Automatic check if update working in device ?` })
   await cancelCommand(doRun, orgId, snag)
   if (doRun) {
     p.log.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`)
-    p.log.info('Waiting...')
-    await waitLog('onboarding-v2', supabase, appId, snag, orgId)
+    p.log.info('Waiting... (there is a usual delay of 15 seconds until the backend process the logs)')
+    await waitLog('onboarding-v2', apikey, appId, snag, orgId)
   }
   else {
     const appIdUrl = convertAppName(appId)
@@ -331,7 +329,7 @@ export async function initApp(apikeyCommand: string, appId: string, options: Sup
   await step7(orgId, snag, apikey, appId)
   await step8(orgId, snag, apikey, appId)
   await step9(orgId, snag)
-  // await step10(orgId, snag, supabase, appId)
+  await step10(orgId, snag, apikey, appId)
 
   await markStep(orgId, snag, 0)
   p.log.info(`Welcome onboard ✈️!`)

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
         }
@@ -1638,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
@@ -1814,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
@@ -1939,6 +1967,24 @@ export interface Database {
         | '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'