@capgo/cli 4.12.0 → 4.12.2

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.12.2](https://github.com/Cap-go/CLI/compare/v4.12.1...v4.12.2) (2024-07-08)
+
+
+### Bug Fixes
+
+* issue with upload ([ca08aec](https://github.com/Cap-go/CLI/commit/ca08aec7f38e1ae9c431ba35764f8659b23692e1))
+
+### [4.12.1](https://github.com/Cap-go/CLI/compare/v4.12.0...v4.12.1) (2024-07-08)
+
+
+### Bug Fixes
+
+* types ([3ee5a38](https://github.com/Cap-go/CLI/commit/3ee5a3872d2b74894e42b26c492a572edae2baa3))
+
 ## [4.12.0](https://github.com/Cap-go/CLI/compare/v4.11.7...v4.12.0) (2024-07-08)
 
 

package/dist/index.js

@@ -87381,7 +87381,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.12.0",
+  version: "4.12.2",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -89188,7 +89188,9 @@ async function getLocalDepenencies() {
   return dependenciesObject;
 }
 async function getRemoteChecksums(supabase, appId, channel2) {
-  const { data, error } = await supabase.from("channels").select(`version ( checksum )`).eq("name", channel2).eq("app_id", appId).single();
+  const { data, error } = await supabase.from("channels").select(`version ( 
+            checksum 
+        )`).eq("name", channel2).eq("app_id", appId).single();
   if (error || data === null || !data.version || !data.version.checksum) {
     f2.error(`Cannot get remote checksum for channel ${channel2}`);
     f2.error(`Error: ${error?.message}`);
@@ -90223,8 +90225,8 @@ async function uploadBundleToCapgoCloud(supabase, appid, bundle2, orgId, zipped,
   const uploadTime = ((endTime - startTime) / 1e3).toFixed(2);
   spinner.stop(`Bundle Uploaded \u{1F4AA} (${uploadTime} seconds)`);
 }
-async function setVersionInChannel(supabase, options, bundle2, channel2, userId, orgId, appid, localConfig, permissions) {
-  const { data: versionId } = await supabase.rpc("get_app_versions", { apikey: options.apikey, name_version: bundle2, appid }).single();
+async function setVersionInChannel(supabase, apikey, displayBundleUrl, bundle2, channel2, userId, orgId, appid, localConfig, permissions) {
+  const { data: versionId } = await supabase.rpc("get_app_versions", { apikey, name_version: bundle2, appid }).single();
   if (versionId && hasOrganizationPerm(permissions, 3 /* write */)) {
     const { error: dbError3, data } = await updateOrCreateChannel(supabase, {
       name: channel2,
@@ -90243,7 +90245,7 @@ async function setVersionInChannel(supabase, options, bundle2, channel2, userId,
       f2.info("Your update is now available in your public channel \u{1F389}");
     else if (data?.id)
       f2.info(`Link device to this bundle to try it: ${bundleUrl}`);
-    if (options.bundleUrl) {
+    if (displayBundleUrl) {
       f2.info(`Bundle url: ${bundleUrl}`);
     } else if (!versionId) {
       f2.warn("Cannot set bundle with upload key, use key with more rights for that");
@@ -90283,7 +90285,7 @@ async function uploadBundle(preAppid, options, shouldExit = true) {
   const userId = await verifyUser(supabase, apikey, ["write", "all", "upload"]);
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, apikey, appid, 2 /* upload */);
   const orgId = await getOrganizationId(supabase, appid);
-  await checkPlanValid(supabase, orgId, options.apikey, appid, true);
+  await checkPlanValid(supabase, orgId, apikey, appid, true);
   await checkTrial(supabase, orgId, localConfig);
   const { nativePackages, minUpdateVersion } = await verifyCompatibility(supabase, pm2, options, channel2, appid, bundle2);
   await checkVersionExists(supabase, appid, bundle2);
@@ -90328,7 +90330,7 @@ async function uploadBundle(preAppid, options, shouldExit = true) {
       program.error("");
     }
   }
-  await setVersionInChannel(supabase, options, bundle2, channel2, userId, orgId, appid, localConfig, permissions);
+  await setVersionInChannel(supabase, apikey, !!options.bundleUrl, bundle2, channel2, userId, orgId, appid, localConfig, permissions);
   await snag.track({
     channel: "app",
     event: "App Uploaded",
@@ -90345,19 +90347,19 @@ async function uploadBundle(preAppid, options, shouldExit = true) {
   }
   return true;
 }
-async function uploadCommand(apikey, options) {
+async function uploadCommand(appid, options) {
   try {
-    await uploadBundle(apikey, options, true);
+    await uploadBundle(appid, options, true);
   } catch (error) {
     f2.error(formatError(error));
     program.error("");
   }
 }
-async function uploadDeprecatedCommand(apikey, options) {
+async function uploadDeprecatedCommand(appid, options) {
   const pm2 = getPMAndCommand();
   f2.warn(`\u26A0\uFE0F  This command is deprecated, use "${pm2.runner} @capgo/cli bundle upload" instead \u26A0\uFE0F`);
   try {
-    await uploadBundle(apikey, options, true);
+    await uploadBundle(appid, options, true);
   } catch (error) {
     f2.error(formatError(error));
     program.error("");

package/package.json

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

package/src/bundle/upload.ts

@@ -343,7 +343,8 @@ async function uploadBundleToCapgoCloud(supabase: SupabaseType, appid: string, b
 
 async function setVersionInChannel(
   supabase: SupabaseType,
-  options: Options,
+  apikey: string,
+  displayBundleUrl: boolean,
   bundle: string,
   channel: string,
   userId: string,
@@ -353,7 +354,7 @@ async function setVersionInChannel(
   permissions: OrganizationPerm,
 ) {
   const { data: versionId } = await supabase
-    .rpc('get_app_versions', { apikey: options.apikey, name_version: bundle, appid })
+    .rpc('get_app_versions', { apikey, name_version: bundle, appid })
     .single()
 
   if (versionId && hasOrganizationPerm(permissions, OrganizationPerm.write)) {
@@ -375,7 +376,7 @@ async function setVersionInChannel(
     else if (data?.id)
       p.log.info(`Link device to this bundle to try it: ${bundleUrl}`)
 
-    if (options.bundleUrl) {
+    if (displayBundleUrl) {
       p.log.info(`Bundle url: ${bundleUrl}`)
     }
     else if (!versionId) {
@@ -436,7 +437,7 @@ export async function uploadBundle(preAppid: string, options: Options, shouldExi
 
   // Now if it does exist we will fetch the org id
   const orgId = await getOrganizationId(supabase, appid)
-  await checkPlanValid(supabase, orgId, options.apikey, appid, true)
+  await checkPlanValid(supabase, orgId, apikey, appid, true)
   await checkTrial(supabase, orgId, localConfig)
   const { nativePackages, minUpdateVersion } = await verifyCompatibility(supabase, pm, options, channel, appid, bundle)
   await checkVersionExists(supabase, appid, bundle)
@@ -488,7 +489,7 @@ export async function uploadBundle(preAppid: string, options: Options, shouldExi
     }
   }
 
-  await setVersionInChannel(supabase, options, bundle, channel, userId, orgId, appid, localConfig, permissions)
+  await setVersionInChannel(supabase, apikey, !!options.bundleUrl, bundle, channel, userId, orgId, appid, localConfig, permissions)
 
   await snag.track({
     channel: 'app',
@@ -507,9 +508,9 @@ export async function uploadBundle(preAppid: string, options: Options, shouldExi
   return true
 }
 
-export async function uploadCommand(apikey: string, options: Options) {
+export async function uploadCommand(appid: string, options: Options) {
   try {
-    await uploadBundle(apikey, options, true)
+    await uploadBundle(appid, options, true)
   }
   catch (error) {
     p.log.error(formatError(error))
@@ -517,11 +518,11 @@ export async function uploadCommand(apikey: string, options: Options) {
   }
 }
 
-export async function uploadDeprecatedCommand(apikey: string, options: Options) {
+export async function uploadDeprecatedCommand(appid: string, options: Options) {
   const pm = getPMAndCommand()
   p.log.warn(`⚠️  This command is deprecated, use "${pm.runner} @capgo/cli bundle upload" instead ⚠️`)
   try {
-    await uploadBundle(apikey, options, true)
+    await uploadBundle(appid, options, true)
   }
   catch (error) {
     p.log.error(formatError(error))

package/src/types/supabase.types.ts

@@ -1053,6 +1053,7 @@ export interface Database {
       }
       users: {
         Row: {
+          ban_time: string | null
           billing_email: string | null
           country: string | null
           created_at: string | null
@@ -1068,6 +1069,7 @@ export interface Database {
           updated_at: string | null
         }
         Insert: {
+          ban_time?: string | null
           billing_email?: string | null
           country?: string | null
           created_at?: string | null
@@ -1083,6 +1085,7 @@ export interface Database {
           updated_at?: string | null
         }
         Update: {
+          ban_time?: string | null
           billing_email?: string | null
           country?: string | null
           created_at?: string | null
@@ -1985,6 +1988,8 @@ export interface Database {
         | 'cannotGetBundle'
         | 'checksum_fail'
         | 'NoChannelOrOverride'
+        | 'setChannel'
+        | 'getChannel'
       stripe_status:
         | 'created'
         | 'succeeded'

package/src/utils.ts

@@ -920,7 +920,9 @@ export async function getLocalDepenencies() {
 export async function getRemoteChecksums(supabase: SupabaseClient<Database>, appId: string, channel: string) {
   const { data, error } = await supabase
     .from('channels')
-    .select(`version ( checksum )`)
+    .select(`version ( 
+            checksum 
+        )`)
     .eq('name', channel)
     .eq('app_id', appId)
     .single()