@capgo/cli 4.2.2-alpha.0 → 4.2.3

package/dist/index.js

@@ -61137,7 +61137,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.2.2-alpha.0",
+  version: "4.2.3",
   description: "A CLI to upload to capgo servers",
   main: "dist/index.js",
   bin: {
@@ -62312,6 +62312,11 @@ var defaultHostWeb = "https://web.capgo.app";
 var 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-]+)*))?$/;
 var formatError = (error) => error ? `
 ${import_prettyjson.default.render(error)}` : "";
+function wait(ms) {
+  return new Promise((resolve2) => {
+    setTimeout(resolve2, ms);
+  });
+}
 async function getConfig() {
   let config;
   try {
@@ -62388,6 +62393,10 @@ async function isTrial(supabase, userId) {
   const { data } = await supabase.rpc("is_trial", { userid: userId }).single();
   return data || 0;
 }
+async function isAllowedAction(supabase, userId) {
+  const { data } = await supabase.rpc("is_allowed_action_user", { userid: userId }).single();
+  return !!data;
+}
 async function isAllowedActionAppIdApiKey(supabase, appId, apikey) {
   const { data } = await supabase.rpc("is_allowed_action", { apikey, appid: appId }).single();
   return !!data;
@@ -62489,19 +62498,19 @@ async function isAllowedAppOrg(supabase, apikey, appId) {
     error: functionError
   };
 }
-async function checkPlanValid(supabase, userId, appId, apikey, warning = true) {
+async function checkPlanValid(supabase, userId, apikey, appId, warning = true) {
   const config = await getRemoteConfig();
-  const validPlan = await isAllowedActionAppIdApiKey(supabase, appId, apikey);
+  const validPlan = await (appId ? isAllowedActionAppIdApiKey(supabase, appId, apikey) : isAllowedAction(supabase, userId));
   if (!validPlan) {
     f2.error(`You need to upgrade your plan to continue to use capgo.
  Upgrade here: ${config.hostWeb}/dashboard/settings/plans
 `);
-    setTimeout(() => {
-      Promise.resolve().then(() => (init_open(), open_exports)).then((module2) => {
-        module2.default(`${config.hostWeb}/dashboard/settings/plans`);
-      });
-      program.error("");
-    }, 1e3);
+    wait(100);
+    Promise.resolve().then(() => (init_open(), open_exports)).then((module2) => {
+      module2.default(`${config.hostWeb}/dashboard/settings/plans`);
+    });
+    wait(500);
+    program.error("");
   }
   const trialDays = await isTrial(supabase, userId);
   const ispaying = await isPaying(supabase, userId);
@@ -62979,11 +62988,6 @@ async function checkAppExistsAndHasPermissionOrgErr(supabase, apikey, appid, req
 var newIconPath = "assets/icon.png";
 
 // src/app/debug.ts
-function wait(ms) {
-  return new Promise((resolve2) => {
-    setTimeout(resolve2, ms);
-  });
-}
 async function markSnag(channel2, userId, snag, event, icon = "\u2705") {
   await snag.track({
     channel: channel2,
@@ -63504,7 +63508,7 @@ async function uploadBundle(appid, options, shouldExit = true) {
   const supabase = await createSupabaseClient(options.apikey);
   const userId = await verifyUser(supabase, options.apikey, ["write", "all", "upload"]);
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, 2 /* upload */);
-  await checkPlanValid(supabase, userId, appid, options.apikey, false);
+  await checkPlanValid(supabase, userId, options.apikey, appid, true);
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel2);
   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;
@@ -63942,6 +63946,7 @@ async function addApp(appId, options, throwErr = true) {
   }
   const supabase = await createSupabaseClient(options.apikey);
   const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
+  await checkPlanValid(supabase, userId, options.apikey, void 0, false);
   const appExist = await checkAppExists(supabase, appId);
   if (throwErr && appExist) {
     f2.error(`App ${appId} already exist`);
@@ -64620,7 +64625,7 @@ async function setChannel(channel2, appId, options) {
     program.error("");
   }
   try {
-    await checkPlanValid(supabase, userId, appId, options.apikey);
+    await checkPlanValid(supabase, userId, options.apikey, appId);
     const channelPayload = {
       created_by: userId,
       app_id: appId,
@@ -64990,7 +64995,7 @@ async function setApp(appId, options) {
       contentType: iconType
     });
     if (error) {
-      f2.error(`Could not add app ${formatError(error)}`);
+      f2.error(`Could not set app ${formatError(error)}`);
       program.error(``);
     }
     const { data: signedURLData } = await supabase.storage.from(`images/${userId}/${appId}`).getPublicUrl(fileName);
@@ -65002,7 +65007,7 @@ async function setApp(appId, options) {
     retention: !retention ? void 0 : retention * 24 * 60 * 60
   }).eq("app_id", appId).eq("user_id", userId);
   if (dbError) {
-    f2.error(`Could not add app ${formatError(dbError)}`);
+    f2.error(`Could not set app ${formatError(dbError)}`);
     program.error(``);
   }
   $e(`Done \u2705`);

package/package.json

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

package/src/app/add.ts

@@ -8,6 +8,7 @@ import { checkLatest } from '../api/update'
 import type { Options } from '../api/app'
 import { checkAppExists, newIconPath } from '../api/app'
 import {
+  checkPlanValid,
   createSupabaseClient,
   findSavedKey,
   formatError,
@@ -37,6 +38,9 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
   const supabase = await createSupabaseClient(options.apikey)
 
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+
+  await checkPlanValid(supabase, userId, options.apikey, undefined, false)
+
   // Check we have app access to this appId
   const appExist = await checkAppExists(supabase, appId)
   if (throwErr && appExist) {

package/src/app/debug.ts

@@ -6,13 +6,7 @@ import type LogSnag from 'logsnag'
 import type { Database } from '../types/supabase.types'
 import { checkAppExistsAndHasPermissionErr } from '../api/app'
 import { checkLatest } from '../api/update'
-import { convertAppName, createSupabaseClient, findSavedKey, formatError, getConfig, getLocalConfig, useLogSnag, verifyUser } from '../utils'
-
-function wait(ms: number) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms)
-  })
-}
+import { convertAppName, createSupabaseClient, findSavedKey, formatError, getConfig, getLocalConfig, useLogSnag, verifyUser, wait } from '../utils'
 
 export interface OptionsBaseDebug {
   apikey: string

package/src/app/set.ts

@@ -66,7 +66,7 @@ export async function setApp(appId: string, options: Options) {
         contentType: iconType,
       })
     if (error) {
-      p.log.error(`Could not add app ${formatError(error)}`)
+      p.log.error(`Could not set app ${formatError(error)}`)
       program.error(``)
     }
     const { data: signedURLData } = await supabase
@@ -86,7 +86,7 @@ export async function setApp(appId: string, options: Options) {
     .eq('app_id', appId)
     .eq('user_id', userId)
   if (dbError) {
-    p.log.error(`Could not add app ${formatError(dbError)}`)
+    p.log.error(`Could not set app ${formatError(dbError)}`)
     program.error(``)
   }
   p.outro(`Done ✅`)

package/src/bundle/unlink.ts

@@ -55,7 +55,7 @@ export async function unlinkDevice(channel: string, appId: string, options: Opti
     program.error('')
   }
   try {
-    await checkPlanValid(supabase, userId, appId, options.apikey)
+    await checkPlanValid(supabase, userId, options.apikey, appId)
 
     const versionData = await getVersionData(supabase, appId, userId, bundle)
     await checkVersionNotUsedInChannel(supabase, appId, userId, versionData)

package/src/bundle/upload.ts

@@ -118,7 +118,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   // await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid);
 
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.upload)
-  await checkPlanValid(supabase, userId, appid, options.apikey, false)
+  await checkPlanValid(supabase, userId, options.apikey, appid, true)
 
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel)
 

package/src/channel/set.ts

@@ -75,7 +75,7 @@ export async function setChannel(channel: string, appId: string, options: Option
     program.error('')
   }
   try {
-    await checkPlanValid(supabase, userId, appId, options.apikey)
+    await checkPlanValid(supabase, userId, options.apikey, appId)
     const channelPayload: Database['public']['Tables']['channels']['Insert'] = {
       created_by: userId,
       app_id: appId,

package/src/types/supabase.types.ts

@@ -1280,6 +1280,13 @@ export interface Database {
           count: number
         }[]
       }
+      count_all_plans_v2: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          plan_name: string
+          count: number
+        }[]
+      }
       count_all_trial: {
         Args: Record<PropertyKey, never>
         Returns: number
@@ -1299,13 +1306,6 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: undefined
       }
-      exist_app: {
-        Args: {
-          appid: string
-          apikey: string
-        }
-        Returns: boolean
-      }
       exist_app_v2: {
         Args: {
           appid: string
@@ -1474,16 +1474,6 @@ export interface Database {
         }
         Returns: string
       }
-      get_orgs: {
-        Args: {
-          userid: string
-        }
-        Returns: {
-          id: string
-          logo: string
-          name: string
-        }[]
-      }
       get_orgs_v2: {
         Args: {
           userid: string
@@ -1512,17 +1502,12 @@ export interface Database {
           is_canceled: boolean
         }[]
       }
-      get_plan_usage_percent:
-        | {
-          Args: Record<PropertyKey, never>
-          Returns: number
-        }
-        | {
-          Args: {
-            userid: string
-          }
-          Returns: number
+      get_plan_usage_percent: {
+        Args: {
+          userid: string
         }
+        Returns: number
+      }
       get_total_app_storage_size:
         | {
           Args: {
@@ -1537,57 +1522,6 @@ export interface Database {
           }
           Returns: number
         }
-      get_total_stats_v2:
-        | {
-          Args: {
-            dateid: string
-          }
-          Returns: {
-            mau: number
-            bandwidth: number
-            storage: number
-          }[]
-        }
-        | {
-          Args: {
-            userid: string
-            dateid: string
-          }
-          Returns: {
-            mau: number
-            bandwidth: number
-            storage: number
-          }[]
-        }
-      get_total_stats_v3:
-        | {
-          Args: Record<PropertyKey, never>
-          Returns: {
-            mau: number
-            bandwidth: number
-            storage: number
-          }[]
-        }
-        | {
-          Args: {
-            userid: string
-          }
-          Returns: {
-            mau: number
-            bandwidth: number
-            storage: number
-          }[]
-        }
-      get_total_stats_v4: {
-        Args: {
-          userid: string
-        }
-        Returns: {
-          mau: number
-          bandwidth: number
-          storage: number
-        }[]
-      }
       get_total_stats_v5: {
         Args: {
           userid: string
@@ -1827,28 +1761,18 @@ export interface Database {
           }
           Returns: boolean
         }
-      is_good_plan_v3:
-        | {
-          Args: Record<PropertyKey, never>
-          Returns: boolean
-        }
-        | {
-          Args: {
-            userid: string
-          }
-          Returns: boolean
-        }
-      is_good_plan_v4:
-        | {
-          Args: Record<PropertyKey, never>
-          Returns: boolean
+      is_good_plan_v3: {
+        Args: {
+          userid: string
         }
-        | {
-          Args: {
-            userid: string
-          }
-          Returns: boolean
+        Returns: boolean
+      }
+      is_good_plan_v5: {
+        Args: {
+          userid: string
         }
+        Returns: boolean
+      }
       is_member_of_org: {
         Args: {
           user_id: string
@@ -1862,12 +1786,6 @@ export interface Database {
         }
         Returns: boolean
       }
-      is_not_deleted_v2: {
-        Args: {
-          email_check: string
-        }
-        Returns: boolean
-      }
       is_onboarded:
         | {
           Args: Record<PropertyKey, never>

package/src/utils.ts

@@ -26,6 +26,12 @@ export interface OptionsBase {
   apikey: string
 }
 
+export function wait(ms: number) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms)
+  })
+}
+
 export async function getConfig() {
   let config: Config
   try {
@@ -276,18 +282,19 @@ export async function isAllowedAppOrg(supabase: SupabaseClient<Database>, apikey
   }
 }
 
-export async function checkPlanValid(supabase: SupabaseClient<Database>, userId: string, appId: string, apikey: string, warning = true) {
+export async function checkPlanValid(supabase: SupabaseClient<Database>, userId: string, apikey: string, appId?: string, warning = true) {
   const config = await getRemoteConfig()
-  const validPlan = await isAllowedActionAppIdApiKey(supabase, appId, apikey)
+
+  const validPlan = await (appId ? isAllowedActionAppIdApiKey(supabase, appId, apikey) : isAllowedAction(supabase, userId))
   if (!validPlan) {
     p.log.error(`You need to upgrade your plan to continue to use capgo.\n Upgrade here: ${config.hostWeb}/dashboard/settings/plans\n`)
-    setTimeout(() => {
-      import('open')
-        .then((module) => {
-          module.default(`${config.hostWeb}/dashboard/settings/plans`)
-        })
-      program.error('')
-    }, 1000)
+    wait(100)
+    import('open')
+      .then((module) => {
+        module.default(`${config.hostWeb}/dashboard/settings/plans`)
+      })
+    wait(500)
+    program.error('')
   }
   const trialDays = await isTrial(supabase, userId)
   const ispaying = await isPaying(supabase, userId)