@capgo/cli 4.7.0 → 4.8.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.8.0](https://github.com/Cap-go/CLI/compare/v4.7.0...v4.8.0) (2024-05-10)
+
+
+### Features
+
+* auto select package manager and runner ([94f8bef](https://github.com/Cap-go/CLI/commit/94f8bef06efeafbd5cff1979f5ed75de2a523caa))
+
 ## [4.7.0](https://github.com/Cap-go/CLI/compare/v4.6.3...v4.7.0) (2024-05-10)
 
 

package/dist/index.js

@@ -92373,7 +92373,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.7.0",
+  version: "4.8.0",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -92418,7 +92418,7 @@ var package_default = {
   dependencies: {
     "@aws-sdk/client-s3": "^3.563.0",
     "@capacitor/cli": "6.0.0",
-    "@capgo/find-package-manager": "^0.0.13",
+    "@capgo/find-package-manager": "^0.0.16",
     "@clack/prompts": "^0.7.0",
     "@supabase/supabase-js": "^2.42.7",
     "@tomasklaen/checksum": "^1.1.0",
@@ -93558,20 +93558,41 @@ var findPackageManagerType = (path3 = ".", defaultPackageManager = "unknown") =>
   }
   return defaultPm;
 };
-var findInstallCommand = (packageManagerType = findPackageManagerType()) => {
+var findInstallCommand = (packageManagerType = findPackageManagerType(), prefix = false) => {
   switch (packageManagerType) {
     case "bun":
-      return "install";
+      return prefix ? "bun install" : "install";
     case "pnpm":
-      return "install";
+      return prefix ? "pnpm install" : "install";
     case "yarn":
-      return "add";
+      return prefix ? "yarn install" : "install";
     case "npm":
-      return "install";
+      return prefix ? "npm install" : "install";
+    case "unknown":
+      return prefix ? "unknown unknown" : "unknown";
     default:
-      return "install";
+      return prefix ? "npm install" : "install";
   }
 };
+var findPackageManagerRunner = (path3 = ".", defaultPackageManagerRunner = "npx") => {
+  const bunPath = `${path3}/bun.lockb`;
+  const pnpmPath = `${path3}/pnpm-lock.yaml`;
+  const yarnPath = `${path3}/yarn.lock`;
+  const npmPath = `${path3}/package-lock.json`;
+  if ((0, import_fs.existsSync)(bunPath)) {
+    return "bunx";
+  }
+  if ((0, import_fs.existsSync)(pnpmPath)) {
+    return "pnpm exec";
+  }
+  if ((0, import_fs.existsSync)(yarnPath)) {
+    return "yarn dlx";
+  }
+  if ((0, import_fs.existsSync)(npmPath)) {
+    return "npx";
+  }
+  return defaultPackageManagerRunner;
+};
 
 // src/utils.ts
 var baseKey = ".capgo_key";
@@ -93592,7 +93613,7 @@ async function getConfig() {
   try {
     config = await (0, import_config.loadConfig)();
   } catch (err) {
-    f2.error("No capacitor config file found, run `cap init` first");
+    f2.error(`No capacitor config file found, run \`cap init\` first ${formatError(err)}`);
     program.error("");
   }
   return config;
@@ -93793,7 +93814,7 @@ function findSavedKey(quiet = false) {
     key2 = (0, import_node_fs4.readFileSync)(keyPath, "utf8").trim();
   }
   if (!key2) {
-    f2.error(`Cannot find API key in local folder or global, please login first with npx @capacitor/cli login`);
+    f2.error(`Cannot find API key in local folder or global, please login first with ${getPMAndCommand().runner} @capacitor/cli login`);
     program.error("");
   }
   return key2;
@@ -93986,6 +94007,19 @@ function getHumanDate(createdA) {
   const date = new Date(createdA || "");
   return date.toLocaleString();
 }
+var pmFetched = false;
+var pm = "npm";
+var pmCommand = "install";
+var pmRunner = "npx";
+function getPMAndCommand() {
+  if (pmFetched)
+    return { pm, command: pmCommand, installCommand: `${pm} ${pmCommand}`, runner: pmRunner };
+  pm = findPackageManagerType(".", "npm");
+  pmCommand = findInstallCommand(pm);
+  pmFetched = true;
+  pmRunner = findPackageManagerRunner();
+  return { pm, command: pmCommand, installCommand: `${pm} ${pmCommand}`, runner: pmRunner };
+}
 async function getLocalDepenencies() {
   if (!(0, import_node_fs4.existsSync)("./package.json")) {
     f2.error("Missing package.json, you need to be in a capacitor project");
@@ -94011,9 +94045,9 @@ async function getLocalDepenencies() {
     }
   }
   if (!(0, import_node_fs4.existsSync)("./node_modules/")) {
-    const pm = findPackageManagerType(".", "npm");
-    const installCmd = findInstallCommand(pm);
-    f2.error(`Missing node_modules folder, please run ${pm} ${installCmd}`);
+    const pm2 = findPackageManagerType(".", "npm");
+    const installCmd = findInstallCommand(pm2);
+    f2.error(`Missing node_modules folder, please run ${pm2} ${installCmd}`);
     program.error("");
   }
   let anyInvalid = false;
@@ -94021,9 +94055,9 @@ async function getLocalDepenencies() {
     const dependencyFolderExists = (0, import_node_fs4.existsSync)(`./node_modules/${key2}`);
     if (!dependencyFolderExists) {
       anyInvalid = true;
-      const pm = findPackageManagerType(".", "npm");
-      const installCmd = findInstallCommand(pm);
-      f2.error(`Missing dependency ${key2}, please run ${pm} ${installCmd}`);
+      const pm2 = findPackageManagerType(".", "npm");
+      const installCmd = findInstallCommand(pm2);
+      f2.error(`Missing dependency ${key2}, please run ${pm2} ${installCmd}`);
       return { name: key2, version: value };
     }
     let hasNativeFiles = false;
@@ -94266,6 +94300,7 @@ async function checkAppExists(supabase, appid) {
   return !!app2;
 }
 async function checkAppExistsAndHasPermissionOrgErr(supabase, apikey, appid, requiredPermission) {
+  const pm2 = getPMAndCommand();
   const permissions = await isAllowedAppOrg(supabase, apikey, appid);
   if (!permissions.okay) {
     switch (permissions.error) {
@@ -94275,7 +94310,7 @@ async function checkAppExistsAndHasPermissionOrgErr(supabase, apikey, appid, req
         break;
       }
       case "NO_APP": {
-        f2.error(`App ${appid} does not exist`);
+        f2.error(`App ${appid} does not exist, run first \`${pm2.runner} @capgo/cli app add ${appid}\` to create it`);
         program.error("");
         break;
       }
@@ -94778,6 +94813,7 @@ var import_client_s3 = __toESM(require_dist_cjs71());
 var alertMb2 = 20;
 var UPLOAD_TIMEOUT = 12e4;
 async function uploadBundle(appid, options, shouldExit = true) {
+  const pm2 = getPMAndCommand();
   oe(`Uploading`);
   await checkLatest();
   let { bundle: bundle2, path: path3, channel: channel2 } = options;
@@ -94801,7 +94837,7 @@ async function uploadBundle(appid, options, shouldExit = true) {
   const snag = useLogSnag();
   channel2 = channel2 || "dev";
   const config = await getConfig();
-  const localS3 = (config.app.extConfig.plugins && config.app.extConfig.plugins.CapacitorUpdater && config.app.extConfig.plugins.CapacitorUpdater.localS3) === true;
+  const localS3 = (config?.app?.extConfig?.plugins && config?.app?.extConfig?.plugins?.CapacitorUpdater && config?.app?.extConfig?.plugins?.CapacitorUpdater?.localS3) === true;
   const checkNotifyAppReady = options.codeCheck;
   appid = appid || config?.app?.appId;
   const uuid = (0, import_node_crypto3.randomUUID)().split("-")[0];
@@ -94815,8 +94851,8 @@ async function uploadBundle(appid, options, shouldExit = true) {
     f2.error(`Missing API key, you need to provide a API key to upload your bundle`);
     program.error("");
   }
-  if (!appid || !bundle2 || !path3) {
-    f2.error("Missing argument, you need to provide a appid and a bundle and a path, or be in a capacitor project");
+  if (!appid || !path3) {
+    f2.error("Missing argument, you need to provide a appid and a path (--path), or be in a capacitor project");
     program.error("");
   }
   if (s3BucketName || s3Region || s3Apikey || s3Apisecret) {
@@ -94863,7 +94899,7 @@ async function uploadBundle(appid, options, shouldExit = true) {
     localDependencies = localDependenciesWithChannel;
     if (finalCompatibility.find((x3) => x3.localVersion !== x3.remoteVersion)) {
       f2.error(`Your bundle is not compatible with the channel ${channel2}`);
-      f2.warn(`You can check compatibility with "npx @capgo/cli bundle compatibility"`);
+      f2.warn(`You can check compatibility with "${pm2.runner} @capgo/cli bundle compatibility"`);
       if (autoMinUpdateVersion) {
         minUpdateVersion = bundle2;
         f2.info(`Auto set min-update-version to ${minUpdateVersion}`);
@@ -95143,7 +95179,8 @@ async function uploadCommand(apikey, options) {
   }
 }
 async function uploadDeprecatedCommand(apikey, options) {
-  f2.warn('\u26A0\uFE0F  This command is deprecated, use "npx @capgo/cli bundle upload" instead \u26A0\uFE0F');
+  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);
   } catch (error) {
@@ -95156,6 +95193,10 @@ async function uploadDeprecatedCommand(apikey, options) {
 var import_node_fs9 = require("node:fs");
 var import_node_os3 = require("node:os");
 var import_node_process14 = __toESM(require("node:process"));
+async function doLoginExists() {
+  const userHomeDir = (0, import_node_os3.homedir)();
+  return (0, import_node_fs9.existsSync)(`${userHomeDir}/.capgo`) || (0, import_node_fs9.existsSync)(".capgo");
+}
 async function login(apikey, options, shouldExit = true) {
   if (shouldExit)
     oe(`Login to Capgo`);
@@ -95343,7 +95384,7 @@ async function addApp(appId, options, throwErr = true) {
     f2.error(`App ${appId} already exist`);
     program.error("");
   } else if (appExist) {
-    return true;
+    return false;
   }
   const { error: orgError, data: allOrganizations } = await supabase.rpc("get_orgs_v5");
   if (orgError) {
@@ -95467,27 +95508,29 @@ async function markStep(userId, snag, step) {
   return markSnag("onboarding-v2", userId, snag, `onboarding-step-${step}`);
 }
 async function step2(userId, snag, appId, options) {
+  const pm2 = getPMAndCommand();
   const doAdd = await se({ message: `Add ${appId} in Capgo?` });
   await cancelCommand2(doAdd, userId, snag);
   if (doAdd) {
     const s = de();
-    s.start(`Running: npx @capgo/cli@latest app add ${appId}`);
+    s.start(`Running: ${pm2.runner} @capgo/cli@latest app add ${appId}`);
     const addRes = await addApp(appId, options, false);
     if (!addRes)
       s.stop(`App already add \u2705`);
     else
       s.stop(`App add Done \u2705`);
   } else {
-    f2.info(`Run yourself "npx @capgo/cli@latest app add ${appId}"`);
+    f2.info(`Run yourself "${pm2.runner} @capgo/cli@latest app add ${appId}"`);
   }
   await markStep(userId, snag, 2);
 }
 async function step3(userId, snag, apikey, appId) {
+  const pm2 = getPMAndCommand();
   const doChannel = await se({ message: `Create default channel ${defaultChannel} for ${appId} in Capgo?` });
   await cancelCommand2(doChannel, userId, snag);
   if (doChannel) {
     const s = de();
-    s.start(`Running: npx @capgo/cli@latest channel add ${defaultChannel} ${appId} --default`);
+    s.start(`Running: ${pm2.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default`);
     const addChannelRes = await addChannel(defaultChannel, appId, {
       default: true,
       apikey
@@ -95497,13 +95540,14 @@ async function step3(userId, snag, apikey, appId) {
     else
       s.stop(`Channel add Done \u2705`);
   } else {
-    f2.info(`Run yourself "npx @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`);
+    f2.info(`Run yourself "${pm2.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`);
   }
   await markStep(userId, snag, 3);
 }
 var urlMigrateV6 = "https://capacitorjs.com/docs/updating/6-0";
 var urlMigrateV5 = "https://capacitorjs.com/docs/updating/5-0";
 async function step4(userId, snag, apikey, appId) {
+  const pm2 = getPMAndCommand();
   const doInstall = await se({ message: `Automatic Install "@capgo/capacitor-updater" dependency in ${appId}?` });
   await cancelCommand2(doInstall, userId, snag);
   if (doInstall) {
@@ -95527,22 +95571,20 @@ async function step4(userId, snag, apikey, appId) {
       s.stop(`@capacitor/core version is ${coreVersion}, please update to Capacitor v6: ${urlMigrateV6} to access the best features of Capgo`);
       versionToInstall = "^5.0.0";
     }
-    const pm = findPackageManagerType();
-    if (pm === "unknown") {
+    if (pm2.pm === "unknown") {
       s.stop("Error");
-      f2.warn(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm or yarn`);
+      f2.warn(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm, bun or yarn`);
       $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     }
-    const installCmd = findInstallCommand(pm);
     if (pack.dependencies["@capgo/capacitor-updater"]) {
       s.stop(`Capgo already installed \u2705`);
     } else {
-      await (0, import_node_child_process6.execSync)(`${pm} ${installCmd} @capgo/capacitor-updater@${versionToInstall}`, execOption);
+      await (0, import_node_child_process6.execSync)(`${pm2.installCommand} @capgo/capacitor-updater@${versionToInstall}`, execOption);
       s.stop(`Install Done \u2705`);
     }
   } else {
-    f2.info(`Run yourself "npm i @capgo/capacitor-updater@latest"`);
+    f2.info(`Run yourself "${pm2.installCommand} @capgo/capacitor-updater@latest"`);
   }
   await markStep(userId, snag, 4);
 }
@@ -95596,11 +95638,12 @@ ${codeInject};
   }
 }
 async function step6(userId, snag, apikey, appId) {
+  const pm2 = getPMAndCommand();
   const doEncrypt = await se({ message: `Automatic configure end-to-end encryption in ${appId} updates?` });
   await cancelCommand2(doEncrypt, userId, snag);
   if (doEncrypt) {
     const s = de();
-    s.start(`Running: npx @capgo/cli@latest key create`);
+    s.start(`Running: ${pm2.runner} @capgo/cli@latest key create`);
     const keyRes = await createKey({ force: true }, false);
     if (!keyRes) {
       s.stop("Error");
@@ -95615,13 +95658,14 @@ async function step6(userId, snag, apikey, appId) {
   await markStep(userId, snag, 6);
 }
 async function step7(userId, snag, apikey, appId) {
-  const doBuild = await se({ message: `Automatic build ${appId} with "npm run build" ?` });
+  const pm2 = getPMAndCommand();
+  const doBuild = await se({ message: `Automatic build ${appId} with "${pm2.pm} run build" ?` });
   await cancelCommand2(doBuild, userId, snag);
   if (doBuild) {
     const s = de();
     const projectType = await findProjectType();
     const buildCommand = await findBuildCommandForProjectType(projectType);
-    s.start(`Running: npm run ${buildCommand} && npx cap sync`);
+    s.start(`Running: ${pm2.pm} run ${buildCommand} && ${pm2.runner} cap sync`);
     const pack = JSON.parse((0, import_node_fs11.readFileSync)("package.json").toString());
     if (!pack.scripts[buildCommand]) {
       s.stop("Error");
@@ -95629,19 +95673,20 @@ async function step7(userId, snag, apikey, appId) {
       $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     }
-    (0, import_node_child_process6.execSync)(`npm run ${buildCommand} && npx cap sync`, execOption);
+    (0, import_node_child_process6.execSync)(`${pm2.pm} run ${buildCommand} && ${pm2.runner} cap sync`, execOption);
     s.stop(`Build & Sync Done \u2705`);
   } else {
-    f2.info(`Build yourself with command: npm run build && npx cap sync`);
+    f2.info(`Build yourself with command: ${pm2.pm} run build && ${pm2.runner} cap sync`);
   }
   await markStep(userId, snag, 7);
 }
 async function step8(userId, snag, apikey, appId) {
+  const pm2 = getPMAndCommand();
   const doBundle = await se({ message: `Automatic upload ${appId} bundle to Capgo?` });
   await cancelCommand2(doBundle, userId, snag);
   if (doBundle) {
     const s = de();
-    s.start(`Running: npx @capgo/cli@latest bundle upload`);
+    s.start(`Running: ${pm2.runner} @capgo/cli@latest bundle upload`);
     const uploadRes = await uploadBundle(appId, {
       channel: defaultChannel,
       apikey
@@ -95655,11 +95700,12 @@ async function step8(userId, snag, apikey, appId) {
       s.stop(`Upload Done \u2705`);
     }
   } else {
-    f2.info(`Upload yourself with command: npx @capgo/cli@latest bundle upload`);
+    f2.info(`Upload yourself with command: ${pm2.runner} @capgo/cli@latest bundle upload`);
   }
   await markStep(userId, snag, 8);
 }
 async function step9(userId, snag) {
+  const pm2 = getPMAndCommand();
   const doRun = await se({ message: `Run in device now ?` });
   await cancelCommand2(doRun, userId, snag);
   if (doRun) {
@@ -95676,11 +95722,11 @@ async function step9(userId, snag) {
     }
     const platform2 = plaformType;
     const s = de();
-    s.start(`Running: npx cap run ${platform2}`);
-    await (0, import_node_child_process6.spawnSync)("npx", ["cap", "run", platform2], { stdio: "inherit" });
+    s.start(`Running: ${pm2.runner} cap run ${platform2}`);
+    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: npx cap run <ios|android>`);
+    f2.info(`Run yourself with command: ${pm2.runner} cap run <ios|android>`);
   }
   await markStep(userId, snag, 9);
 }
@@ -95697,20 +95743,20 @@ async function step10(userId, snag, supabase, appId) {
   }
   await markStep(userId, snag, 10);
 }
-async function initApp(apikey, appId, options) {
+async function initApp(apikeyCommand, appId, options) {
+  const pm2 = getPMAndCommand();
   oe(`Capgo onboarding \u{1F6EB}`);
   await checkLatest();
   const snag = useLogSnag();
   const config = await getConfig();
   appId = appId || config?.app?.appId;
-  apikey = apikey || findSavedKey();
+  const apikey = apikeyCommand || findSavedKey();
   const log = de();
-  log.start("Running: npx @capgo/cli@latest login ***");
-  const loginRes = await login(apikey, options, false);
-  if (!loginRes)
-    log.stop("Login already done \u2705");
-  else
+  if (!doLoginExists() || apikeyCommand) {
+    log.start(`Running: ${pm2.runner} @capgo/cli@latest login ***`);
+    await login(apikey, options, false);
     log.stop("Login Done \u2705");
+  }
   const supabase = await createSupabaseClient(apikey);
   const userId = await verifyUser(supabase, apikey, ["upload", "all", "read", "write"]);
   await markStep(userId, snag, 1);
@@ -95726,7 +95772,7 @@ async function initApp(apikey, appId, options) {
   await markStep(userId, snag, 0);
   f2.info(`Welcome onboard \u2708\uFE0F!`);
   f2.info(`Your Capgo update system is setup`);
-  f2.info(`Next time use \`npx @capgo/cli@latest bundle upload\` to only upload your bundle`);
+  f2.info(`Next time use \`${pm2.runner} @capgo/cli@latest bundle upload\` to only upload your bundle`);
   $e(`Bye \u{1F44B}`);
   import_node_process16.default.exit();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.563.0",
     "@capacitor/cli": "6.0.0",
-    "@capgo/find-package-manager": "^0.0.13",
+    "@capgo/find-package-manager": "^0.0.16",
     "@clack/prompts": "^0.7.0",
     "@supabase/supabase-js": "^2.42.7",
     "@tomasklaen/checksum": "^1.1.0",

package/src/api/app.ts

@@ -3,7 +3,7 @@ import * as p from '@clack/prompts'
 import { program } from 'commander'
 import type { Database } from '../types/supabase.types'
 import type { OptionsBase } from '../utils'
-import { OrganizationPerm, isAllowedApp, isAllowedAppOrg } from '../utils'
+import { OrganizationPerm, getPMAndCommand, isAllowedAppOrg } from '../utils'
 
 export async function checkAppExists(supabase: SupabaseClient<Database>, appid: string) {
   const { data: app } = await supabase
@@ -12,28 +12,8 @@ export async function checkAppExists(supabase: SupabaseClient<Database>, appid:
   return !!app
 }
 
-export async function checkAppExistsAndHasPermissionErr(supabase: SupabaseClient<Database>, apikey: string, appid: string, shouldExist = true) {
-  const appExist = await checkAppExists(supabase, appid)
-  const perm = await isAllowedApp(supabase, apikey, appid)
-
-  if (appExist && !shouldExist) {
-    p.log.error(`App ${appid} already exist`)
-    program.error('')
-  }
-  if (!appExist && shouldExist) {
-    p.log.error(`App ${appid} does not exist`)
-    program.error('')
-  }
-  if (appExist && !perm) {
-    p.log.error(`App ${appid} exist and you don't have permission to access it`)
-    if (appid === 'io.ionic.starter')
-      p.log.info('Modify your appid in your capacitor.config.json file to something unique, this is a default appid for ionic starter app')
-
-    program.error('')
-  }
-}
-
 export async function checkAppExistsAndHasPermissionOrgErr(supabase: SupabaseClient<Database>, apikey: string, appid: string, requiredPermission: OrganizationPerm) {
+  const pm = getPMAndCommand()
   const permissions = await isAllowedAppOrg(supabase, apikey, appid)
   if (!permissions.okay) {
     switch (permissions.error) {
@@ -43,7 +23,7 @@ export async function checkAppExistsAndHasPermissionOrgErr(supabase: SupabaseCli
         break
       }
       case 'NO_APP': {
-        p.log.error(`App ${appid} does not exist`)
+        p.log.error(`App ${appid} does not exist, run first \`${pm.runner} @capgo/cli app add ${appid}\` to create it`)
         program.error('')
         break
       }

package/src/app/add.ts

@@ -52,7 +52,7 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
     program.error('')
   }
   else if (appExist) {
-    return true
+    return false
   }
 
   const { error: orgError, data: allOrganizations } = await supabase

package/src/bundle/upload.ts

@@ -33,6 +33,7 @@ import {
   getLocalConfig,
   getLocalDepenencies,
   getOrganizationId,
+  getPMAndCommand,
   hasOrganizationPerm,
   regexSemver,
   requireUpdateMetadata,
@@ -70,6 +71,7 @@ interface Options extends OptionsBase {
 const UPLOAD_TIMEOUT = 120000
 
 export async function uploadBundle(appid: string, options: Options, shouldExit = true) {
+  const pm = getPMAndCommand()
   p.intro(`Uploading`)
   await checkLatest()
   let { bundle, path, channel } = options
@@ -96,8 +98,8 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   channel = channel || 'dev'
 
   const config = await getConfig()
-  const localS3: boolean = (config.app.extConfig.plugins && config.app.extConfig.plugins.CapacitorUpdater
-    && config.app.extConfig.plugins.CapacitorUpdater.localS3) === true
+  const localS3: boolean = (config?.app?.extConfig?.plugins && config?.app?.extConfig?.plugins?.CapacitorUpdater
+    && config?.app?.extConfig?.plugins?.CapacitorUpdater?.localS3) === true
 
   const checkNotifyAppReady = options.codeCheck
   appid = appid || config?.app?.appId
@@ -114,8 +116,8 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
     p.log.error(`Missing API key, you need to provide a API key to upload your bundle`)
     program.error('')
   }
-  if (!appid || !bundle || !path) {
-    p.log.error('Missing argument, you need to provide a appid and a bundle and a path, or be in a capacitor project')
+  if (!appid || !path) {
+    p.log.error('Missing argument, you need to provide a appid and a path (--path), or be in a capacitor project')
     program.error('')
   }
   // if one S3 variable is set, check that all are set
@@ -150,8 +152,6 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   const supabase = await createSupabaseClient(options.apikey)
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'upload'])
   // Check we have app access to this appId
-  // await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid);
-
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.upload)
 
   // Now if it does exist we will fetch the org id
@@ -186,7 +186,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
 
     if (finalCompatibility.find(x => x.localVersion !== x.remoteVersion)) {
       p.log.error(`Your bundle is not compatible with the channel ${channel}`)
-      p.log.warn(`You can check compatibility with "npx @capgo/cli bundle compatibility"`)
+      p.log.warn(`You can check compatibility with "${pm.runner} @capgo/cli bundle compatibility"`)
 
       if (autoMinUpdateVersion) {
         minUpdateVersion = bundle
@@ -511,7 +511,8 @@ export async function uploadCommand(apikey: string, options: Options) {
 }
 
 export async function uploadDeprecatedCommand(apikey: string, options: Options) {
-  p.log.warn('⚠️  This command is deprecated, use "npx @capgo/cli bundle upload" instead ⚠️')
+  const pm = getPMAndCommand()
+  p.log.warn(`⚠️  This command is deprecated, use "${pm.runner} @capgo/cli bundle upload" instead ⚠️`)
   try {
     await uploadBundle(apikey, options, true)
   }

package/src/init.ts

@@ -2,7 +2,6 @@ import { readFileSync, writeFileSync } from 'node:fs'
 import type { ExecSyncOptions } from 'node:child_process'
 import { execSync, spawnSync } from 'node:child_process'
 import process from 'node:process'
-import { findInstallCommand, findPackageManagerType } from '@capgo/find-package-manager'
 import * as p from '@clack/prompts'
 import type { SupabaseClient } from '@supabase/supabase-js'
 import type LogSnag from 'logsnag'
@@ -12,11 +11,11 @@ import { markSnag, waitLog } from './app/debug'
 import { createKey } from './key'
 import { addChannel } from './channel/add'
 import { uploadBundle } from './bundle/upload'
-import { login } from './login'
+import { doLoginExists, login } from './login'
 import { addApp } from './app/add'
 import { checkLatest } from './api/update'
 import type { Options } from './api/app'
-import { convertAppName, createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findSavedKey, getConfig, useLogSnag, verifyUser } from './utils'
+import { convertAppName, createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findSavedKey, getConfig, getPMAndCommand, useLogSnag, verifyUser } from './utils'
 
 interface SuperOptions extends Options {
   local: boolean
@@ -40,11 +39,12 @@ async function markStep(userId: string, snag: LogSnag, step: number | string) {
 }
 
 async function step2(userId: string, snag: LogSnag, appId: string, options: SuperOptions) {
+  const pm = getPMAndCommand()
   const doAdd = await p.confirm({ message: `Add ${appId} in Capgo?` })
   await cancelCommand(doAdd, userId, snag)
   if (doAdd) {
     const s = p.spinner()
-    s.start(`Running: npx @capgo/cli@latest app add ${appId}`)
+    s.start(`Running: ${pm.runner} @capgo/cli@latest app add ${appId}`)
     const addRes = await addApp(appId, options, false)
     if (!addRes)
       s.stop(`App already add ✅`)
@@ -52,18 +52,19 @@ async function step2(userId: string, snag: LogSnag, appId: string, options: Supe
       s.stop(`App add Done ✅`)
   }
   else {
-    p.log.info(`Run yourself "npx @capgo/cli@latest app add ${appId}"`)
+    p.log.info(`Run yourself "${pm.runner} @capgo/cli@latest app add ${appId}"`)
   }
   await markStep(userId, snag, 2)
 }
 
 async function step3(userId: string, snag: LogSnag, apikey: string, appId: string) {
+  const pm = getPMAndCommand()
   const doChannel = await p.confirm({ message: `Create default channel ${defaultChannel} for ${appId} in Capgo?` })
   await cancelCommand(doChannel, userId, snag)
   if (doChannel) {
     const s = p.spinner()
     // create production channel public
-    s.start(`Running: npx @capgo/cli@latest channel add ${defaultChannel} ${appId} --default`)
+    s.start(`Running: ${pm.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default`)
     const addChannelRes = await addChannel(defaultChannel, appId, {
       default: true,
       apikey,
@@ -74,7 +75,7 @@ async function step3(userId: string, snag: LogSnag, apikey: string, appId: strin
       s.stop(`Channel add Done ✅`)
   }
   else {
-    p.log.info(`Run yourself "npx @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`)
+    p.log.info(`Run yourself "${pm.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`)
   }
   await markStep(userId, snag, 3)
 }
@@ -82,6 +83,7 @@ async function step3(userId: string, snag: LogSnag, apikey: string, appId: strin
 const urlMigrateV6 = 'https://capacitorjs.com/docs/updating/6-0'
 const urlMigrateV5 = 'https://capacitorjs.com/docs/updating/5-0'
 async function step4(userId: string, snag: LogSnag, apikey: string, appId: string) {
+  const pm = getPMAndCommand()
   const doInstall = await p.confirm({ message: `Automatic Install "@capgo/capacitor-updater" dependency in ${appId}?` })
   await cancelCommand(doInstall, userId, snag)
   if (doInstall) {
@@ -107,27 +109,25 @@ async function step4(userId: string, snag: LogSnag, apikey: string, appId: strin
       s.stop(`@capacitor/core version is ${coreVersion}, please update to Capacitor v6: ${urlMigrateV6} to access the best features of Capgo`)
       versionToInstall = '^5.0.0'
     }
-    const pm = findPackageManagerType()
-    if (pm === 'unknown') {
+    if (pm.pm === 'unknown') {
       s.stop('Error')
-      p.log.warn(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm or yarn`)
+      p.log.warn(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm, bun or yarn`)
       p.outro(`Bye 👋`)
       process.exit()
     }
     // // use pm to install capgo
     // // run command pm install @capgo/capacitor-updater@latest
-    const installCmd = findInstallCommand(pm)
     //  check if capgo is already installed in package.json
     if (pack.dependencies['@capgo/capacitor-updater']) {
       s.stop(`Capgo already installed ✅`)
     }
     else {
-      await execSync(`${pm} ${installCmd} @capgo/capacitor-updater@${versionToInstall}`, execOption as ExecSyncOptions)
+      await execSync(`${pm.installCommand} @capgo/capacitor-updater@${versionToInstall}`, execOption as ExecSyncOptions)
       s.stop(`Install Done ✅`)
     }
   }
   else {
-    p.log.info(`Run yourself "npm i @capgo/capacitor-updater@latest"`)
+    p.log.info(`Run yourself "${pm.installCommand} @capgo/capacitor-updater@latest"`)
   }
   await markStep(userId, snag, 4)
 }
@@ -180,11 +180,12 @@ async function step5(userId: string, snag: LogSnag, apikey: string, appId: strin
 }
 
 async function step6(userId: string, snag: LogSnag, apikey: string, appId: string) {
+  const pm = getPMAndCommand()
   const doEncrypt = await p.confirm({ message: `Automatic configure end-to-end encryption in ${appId} updates?` })
   await cancelCommand(doEncrypt, userId, snag)
   if (doEncrypt) {
     const s = p.spinner()
-    s.start(`Running: npx @capgo/cli@latest key create`)
+    s.start(`Running: ${pm.runner} @capgo/cli@latest key create`)
     const keyRes = await createKey({ force: true }, false)
     if (!keyRes) {
       s.stop('Error')
@@ -201,13 +202,14 @@ async function step6(userId: string, snag: LogSnag, apikey: string, appId: strin
 }
 
 async function step7(userId: string, snag: LogSnag, apikey: string, appId: string) {
-  const doBuild = await p.confirm({ message: `Automatic build ${appId} with "npm run build" ?` })
+  const pm = getPMAndCommand()
+  const doBuild = await p.confirm({ message: `Automatic build ${appId} with "${pm.pm} run build" ?` })
   await cancelCommand(doBuild, userId, snag)
   if (doBuild) {
     const s = p.spinner()
     const projectType = await findProjectType()
     const buildCommand = await findBuildCommandForProjectType(projectType)
-    s.start(`Running: npm run ${buildCommand} && npx cap sync`)
+    s.start(`Running: ${pm.pm} run ${buildCommand} && ${pm.runner} cap sync`)
     const pack = JSON.parse(readFileSync('package.json').toString())
     // check in script build exist
     if (!pack.scripts[buildCommand]) {
@@ -216,21 +218,22 @@ async function step7(userId: string, snag: LogSnag, apikey: string, appId: strin
       p.outro(`Bye 👋`)
       process.exit()
     }
-    execSync(`npm run ${buildCommand} && npx cap sync`, execOption as ExecSyncOptions)
+    execSync(`${pm.pm} run ${buildCommand} && ${pm.runner} cap sync`, execOption as ExecSyncOptions)
     s.stop(`Build & Sync Done ✅`)
   }
   else {
-    p.log.info(`Build yourself with command: npm run build && npx cap sync`)
+    p.log.info(`Build yourself with command: ${pm.pm} run build && ${pm.runner} cap sync`)
   }
   await markStep(userId, snag, 7)
 }
 
 async function step8(userId: string, snag: LogSnag, apikey: string, appId: string) {
+  const pm = getPMAndCommand()
   const doBundle = await p.confirm({ message: `Automatic upload ${appId} bundle to Capgo?` })
   await cancelCommand(doBundle, userId, snag)
   if (doBundle) {
     const s = p.spinner()
-    s.start(`Running: npx @capgo/cli@latest bundle upload`)
+    s.start(`Running: ${pm.runner} @capgo/cli@latest bundle upload`)
     const uploadRes = await uploadBundle(appId, {
       channel: defaultChannel,
       apikey,
@@ -246,12 +249,13 @@ async function step8(userId: string, snag: LogSnag, apikey: string, appId: strin
     }
   }
   else {
-    p.log.info(`Upload yourself with command: npx @capgo/cli@latest bundle upload`)
+    p.log.info(`Upload yourself with command: ${pm.runner} @capgo/cli@latest bundle upload`)
   }
   await markStep(userId, snag, 8)
 }
 
 async function step9(userId: string, snag: LogSnag) {
+  const pm = getPMAndCommand()
   const doRun = await p.confirm({ message: `Run in device now ?` })
   await cancelCommand(doRun, userId, snag)
   if (doRun) {
@@ -269,12 +273,12 @@ async function step9(userId: string, snag: LogSnag) {
 
     const platform = plaformType as 'ios' | 'android'
     const s = p.spinner()
-    s.start(`Running: npx cap run ${platform}`)
-    await spawnSync('npx', ['cap', 'run', platform], { stdio: 'inherit' })
+    s.start(`Running: ${pm.runner} cap run ${platform}`)
+    await spawnSync(pm.runner, ['cap', 'run', platform], { stdio: 'inherit' })
     s.stop(`Started Done ✅`)
   }
   else {
-    p.log.info(`Run yourself with command: npx cap run <ios|android>`)
+    p.log.info(`Run yourself with command: ${pm.runner} cap run <ios|android>`)
   }
   await markStep(userId, snag, 9)
 }
@@ -294,21 +298,21 @@ async function step10(userId: string, snag: LogSnag, supabase: SupabaseClient<Da
   await markStep(userId, snag, 10)
 }
 
-export async function initApp(apikey: string, appId: string, options: SuperOptions) {
+export async function initApp(apikeyCommand: string, appId: string, options: SuperOptions) {
+  const pm = getPMAndCommand()
   p.intro(`Capgo onboarding 🛫`)
   await checkLatest()
   const snag = useLogSnag()
   const config = await getConfig()
   appId = appId || config?.app?.appId
-  apikey = apikey || findSavedKey()
+  const apikey = apikeyCommand || findSavedKey()
 
   const log = p.spinner()
-  log.start('Running: npx @capgo/cli@latest login ***')
-  const loginRes = await login(apikey, options, false)
-  if (!loginRes)
-    log.stop('Login already done ✅')
-  else
+  if (!doLoginExists() || apikeyCommand) {
+    log.start(`Running: ${pm.runner} @capgo/cli@latest login ***`)
+    await login(apikey, options, false)
     log.stop('Login Done ✅')
+  }
 
   const supabase = await createSupabaseClient(apikey)
   const userId = await verifyUser(supabase, apikey, ['upload', 'all', 'read', 'write'])
@@ -327,7 +331,7 @@ export async function initApp(apikey: string, appId: string, options: SuperOptio
   await markStep(userId, snag, 0)
   p.log.info(`Welcome onboard ✈️!`)
   p.log.info(`Your Capgo update system is setup`)
-  p.log.info(`Next time use \`npx @capgo/cli@latest bundle upload\` to only upload your bundle`)
+  p.log.info(`Next time use \`${pm.runner} @capgo/cli@latest bundle upload\` to only upload your bundle`)
   p.outro(`Bye 👋`)
   process.exit()
 }

package/src/login.ts

@@ -9,6 +9,10 @@ import { checkLatest } from './api/update'
 interface Options {
   local: boolean
 }
+export async function doLoginExists() {
+  const userHomeDir = homedir()
+  return existsSync(`${userHomeDir}/.capgo`) || existsSync('.capgo')
+}
 
 export async function login(apikey: string, options: Options, shouldExit = true) {
   if (shouldExit)

package/src/utils.ts

@@ -11,7 +11,8 @@ import { LogSnag } from 'logsnag'
 import * as p from '@clack/prompts'
 import ky from 'ky'
 import { promiseFiles } from 'node-dir'
-import { findInstallCommand, findPackageManagerType } from '@capgo/find-package-manager'
+import type { InstallCommand, PackageManagerRunner, PackageManagerType } from '@capgo/find-package-manager'
+import { findInstallCommand, findPackageManagerRunner, findPackageManagerType } from '@capgo/find-package-manager'
 import type { Database } from './types/supabase.types'
 
 export const baseKey = '.capgo_key'
@@ -39,7 +40,7 @@ export async function getConfig() {
     config = await loadConfig()
   }
   catch (err) {
-    p.log.error('No capacitor config file found, run `cap init` first')
+    p.log.error(`No capacitor config file found, run \`cap init\` first ${formatError(err)}`)
     program.error('')
   }
   return config
@@ -306,7 +307,7 @@ export function findSavedKey(quiet = false) {
     key = readFileSync(keyPath, 'utf8').trim()
   }
   if (!key) {
-    p.log.error(`Cannot find API key in local folder or global, please login first with npx @capacitor/cli login`)
+    p.log.error(`Cannot find API key in local folder or global, please login first with ${getPMAndCommand().runner} @capacitor/cli login`)
     program.error('')
   }
   return key
@@ -625,6 +626,20 @@ export function getHumanDate(createdA: string | null) {
   return date.toLocaleString()
 }
 
+let pmFetched = false
+let pm: PackageManagerType = 'npm'
+let pmCommand: InstallCommand = 'install'
+let pmRunner: PackageManagerRunner = 'npx'
+export function getPMAndCommand() {
+  if (pmFetched)
+    return { pm, command: pmCommand, installCommand: `${pm} ${pmCommand}`, runner: pmRunner }
+  pm = findPackageManagerType('.', 'npm')
+  pmCommand = findInstallCommand(pm)
+  pmFetched = true
+  pmRunner = findPackageManagerRunner()
+  return { pm, command: pmCommand, installCommand: `${pm} ${pmCommand}`, runner: pmRunner }
+}
+
 export async function getLocalDepenencies() {
   if (!existsSync('./package.json')) {
     p.log.error('Missing package.json, you need to be in a capacitor project')