@capgo/cli 4.10.22 → 4.10.23

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.23](https://github.com/Cap-go/CLI/compare/v4.10.22...v4.10.23) (2024-06-19)
+
 ### [4.10.22](https://github.com/Cap-go/CLI/compare/v4.10.21...v4.10.22) (2024-06-19)
 
 

package/dist/index.js

@@ -108745,7 +108745,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.10.22",
+  version: "4.10.23",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -111088,8 +111088,8 @@ async function createKey(options, log = true) {
     oe(`Create keys \u{1F511}`);
   const { publicKey, privateKey } = createRSA();
   if ((0, import_node_fs7.existsSync)(baseKeyPub) && !options.force) {
+    f2.error("Public Key already exists, use --force to overwrite");
     if (log) {
-      f2.error("Public Key already exists, use --force to overwrite");
       program.error("");
     } else {
       return false;
@@ -111097,8 +111097,8 @@ async function createKey(options, log = true) {
   }
   (0, import_node_fs7.writeFileSync)(baseKeyPub, publicKey);
   if ((0, import_node_fs7.existsSync)(baseKey) && !options.force) {
+    f2.error("Private Key already exists, use --force to overwrite");
     if (log) {
-      f2.error("Private Key already exists, use --force to overwrite");
       program.error("");
     } else {
       return false;
@@ -111171,7 +111171,14 @@ async function checkVersionNotUsedInChannel(supabase, appid, versionData) {
   }
 }
 function findUnknownVersion(supabase, appId) {
-  return supabase.from("app_versions").select("id").eq("app_id", appId).eq("name", "unknown").throwOnError().single().then(({ data }) => data);
+  return supabase.from("app_versions").select("id").eq("app_id", appId).eq("name", "unknown").throwOnError().single().then(({ data, error }) => {
+    if (error) {
+      f2.error(`Cannot call findUnknownVersion as it returned an error.
+${formatError(error)}`);
+      program.error("");
+    }
+    return data;
+  });
 }
 function createChannel(supabase, update) {
   return supabase.from("channels").insert(update).select().single();
@@ -111260,12 +111267,17 @@ async function addChannel(channelId, appId, options, shouldExit = true) {
       f2.error(`Cannot find default version for channel creation, please contact Capgo support \u{1F928}`);
       program.error("");
     }
-    await createChannel(supabase, {
+    const res = await createChannel(supabase, {
       name: channelId,
       app_id: appId,
       version: data.id,
       owner_org: orgId
     });
+    if (res.error) {
+      f2.error(`Cannot create Channel \u{1F640}
+${formatError(res.error)}`);
+      program.error("");
+    }
     f2.success(`Channel created \u2705`);
     await snag.track({
       channel: "channel",
@@ -111979,7 +111991,7 @@ async function step2(organization, snag, appId, options) {
     else
       s.stop(`App add Done \u2705`);
   } else {
-    f2.info(`Run yourself "${pm2.runner} @capgo/cli@latest app add ${appId}"`);
+    f2.info(`If you change your mind, run it for yourself with: "${pm2.runner} @capgo/cli@latest app add ${appId}"`);
   }
   await markStep(organization.gid, snag, 2);
 }
@@ -111999,7 +112011,7 @@ async function step3(orgId, snag, apikey, appId) {
     else
       s.stop(`Channel add Done \u2705`);
   } else {
-    f2.info(`Run yourself "${pm2.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`);
+    f2.info(`If you change your mind, run it for yourself with: "${pm2.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`);
   }
   await markStep(orgId, snag, 3);
 }
@@ -112043,7 +112055,7 @@ async function step4(orgId, snag, apikey, appId) {
       s.stop(`Install Done \u2705`);
     }
   } else {
-    f2.info(`Run yourself "${pm2.installCommand} @capgo/capacitor-updater@latest"`);
+    f2.info(`If you change your mind, run it for yourself with: "${pm2.installCommand} @capgo/capacitor-updater@latest"`);
   }
   await markStep(orgId, snag, 4);
 }
@@ -112185,7 +112197,7 @@ async function step9(orgId, snag) {
     await (0, import_node_child_process6.spawnSync)(pm2.runner, ["cap", "run", platform2], { stdio: "inherit" });
     s.stop(`Started Done \u2705`);
   } else {
-    f2.info(`Run yourself with command: ${pm2.runner} cap run <ios|android>`);
+    f2.info(`If you change your mind, run it for yourself with: ${pm2.runner} cap run <ios|android>`);
   }
   await markStep(orgId, snag, 9);
 }

package/package.json

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

package/src/api/channels.ts

@@ -51,7 +51,13 @@ export function findUnknownVersion(supabase: SupabaseClient<Database>, appId: st
     .eq('app_id', appId)
     .eq('name', 'unknown')
     .throwOnError()
-    .single().then(({ data }) => data)
+    .single().then(({ data, error }) => {
+      if (error) {
+        p.log.error(`Cannot call findUnknownVersion as it returned an error.\n${formatError(error)}`)
+        program.error('')
+      }
+      return data
+    })
 }
 
 export function createChannel(supabase: SupabaseClient<Database>, update: Database['public']['Tables']['channels']['Insert']) {

package/src/channel/add.ts

@@ -4,7 +4,7 @@ import * as p from '@clack/prompts'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { createChannel, findUnknownVersion } from '../api/channels'
 import type { OptionsBase } from '../utils'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 interface Options extends OptionsBase {
   default?: boolean
@@ -39,12 +39,18 @@ export async function addChannel(channelId: string, appId: string, options: Opti
       p.log.error(`Cannot find default version for channel creation, please contact Capgo support 🤨`)
       program.error('')
     }
-    await createChannel(supabase, {
+    const res = await createChannel(supabase, {
       name: channelId,
       app_id: appId,
       version: data.id,
       owner_org: orgId,
     })
+
+    if (res.error) {
+      p.log.error(`Cannot create Channel 🙀\n${formatError(res.error)}`)
+      program.error('')
+    }
+
     p.log.success(`Channel created ✅`)
     await snag.track({
       channel: 'channel',

package/src/init.ts

@@ -51,7 +51,7 @@ async function step2(organization: Organization, snag: LogSnag, appId: string, o
       s.stop(`App add Done ✅`)
   }
   else {
-    p.log.info(`Run yourself "${pm.runner} @capgo/cli@latest app add ${appId}"`)
+    p.log.info(`If you change your mind, run it for yourself with: "${pm.runner} @capgo/cli@latest app add ${appId}"`)
   }
   await markStep(organization.gid, snag, 2)
 }
@@ -74,7 +74,7 @@ async function step3(orgId: string, snag: LogSnag, apikey: string, appId: string
       s.stop(`Channel add Done ✅`)
   }
   else {
-    p.log.info(`Run yourself "${pm.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`)
+    p.log.info(`If you change your mind, run it for yourself with: "${pm.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`)
   }
   await markStep(orgId, snag, 3)
 }
@@ -126,7 +126,7 @@ async function step4(orgId: string, snag: LogSnag, apikey: string, appId: string
     }
   }
   else {
-    p.log.info(`Run yourself "${pm.installCommand} @capgo/capacitor-updater@latest"`)
+    p.log.info(`If you change your mind, run it for yourself with: "${pm.installCommand} @capgo/capacitor-updater@latest"`)
   }
   await markStep(orgId, snag, 4)
 }
@@ -277,7 +277,7 @@ async function step9(orgId: string, snag: LogSnag) {
     s.stop(`Started Done ✅`)
   }
   else {
-    p.log.info(`Run yourself with command: ${pm.runner} cap run <ios|android>`)
+    p.log.info(`If you change your mind, run it for yourself with: ${pm.runner} cap run <ios|android>`)
   }
   await markStep(orgId, snag, 9)
 }

package/src/key.ts

@@ -76,8 +76,8 @@ export async function createKey(options: Options, log = true) {
 
   // check if baseName already exist
   if (existsSync(baseKeyPub) && !options.force) {
+    p.log.error('Public Key already exists, use --force to overwrite')
     if (log) {
-      p.log.error('Public Key already exists, use --force to overwrite')
       program.error('')
     }
     else {
@@ -86,8 +86,8 @@ export async function createKey(options: Options, log = true) {
   }
   writeFileSync(baseKeyPub, publicKey)
   if (existsSync(baseKey) && !options.force) {
+    p.log.error('Private Key already exists, use --force to overwrite')
     if (log) {
-      p.log.error('Private Key already exists, use --force to overwrite')
       program.error('')
     }
     else {