@capgo/cli 4.6.1 → 4.6.3

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.6.3](https://github.com/Cap-go/CLI/compare/v4.6.2...v4.6.3) (2024-05-10)
+
+
+### Bug Fixes
+
+* add timeout option ([e8c8890](https://github.com/Cap-go/CLI/commit/e8c8890204bc327443a58b303c5fe8ae132dab2d))
+
+### [4.6.2](https://github.com/Cap-go/CLI/compare/v4.6.1...v4.6.2) (2024-05-08)
+
+
+### Bug Fixes
+
+* better handle nuxt and nextjs ([7f9c0a0](https://github.com/Cap-go/CLI/commit/7f9c0a04ac5097b5ea7b9b9edb0dc815e43ca2e7))
+
 ### [4.6.1](https://github.com/Cap-go/CLI/compare/v4.6.0...v4.6.1) (2024-05-08)
 
 

package/dist/index.js

@@ -92373,7 +92373,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.6.1",
+  version: "4.6.3",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -93770,6 +93770,72 @@ async function* getFiles(dir) {
       yield res;
   }
 }
+async function findProjectType() {
+  const pwd = import_node_process8.default.cwd();
+  for await (const f3 of getFiles(pwd)) {
+    if (f3.includes("angular.json")) {
+      f2.info("Found angular project");
+      return "angular";
+    }
+    if (f3.includes("nuxt.config.js")) {
+      f2.info("Found nuxtjs project");
+      return "nuxtjs";
+    }
+    if (f3.includes("next.config.js")) {
+      f2.info("Found nextjs project");
+      return "nextjs";
+    }
+    if (f3.includes("svelte.config.js")) {
+      f2.info("Found sveltekit project");
+      return "sveltekit";
+    }
+  }
+  return "unknown";
+}
+async function findMainFileForProjectType(projectType) {
+  if (projectType === "angular")
+    return "src/main.ts";
+  if (projectType === "nuxtjs")
+    return "src/main.ts";
+  if (projectType === "nextjs")
+    return "pages/_app.tsx";
+  if (projectType === "sveltekit")
+    return "src/main.ts";
+  return null;
+}
+async function findBuildCommandForProjectType(projectType) {
+  if (projectType === "angular") {
+    f2.info("Angular project detected");
+    return "build";
+  }
+  if (projectType === "nuxtjs") {
+    f2.info("Nuxtjs project detected");
+    return "generate";
+  }
+  if (projectType === "nextjs") {
+    f2.info("Nextjs project detected");
+    f2.warn("Please make sure you have configured static export in your next.config.js: https://nextjs.org/docs/pages/building-your-application/deploying/static-exports");
+    f2.warn("Please make sure you have the output: 'export' and distDir: 'dist' in your next.config.js");
+    const doContinue = await se({ message: "Do you want to continue?" });
+    if (!doContinue) {
+      f2.error("Aborted");
+      program.error("");
+    }
+    return "build";
+  }
+  if (projectType === "sveltekit") {
+    f2.info("Sveltekit project detected");
+    f2.warn("Please make sure you have the adapter-static installed: https://kit.svelte.dev/docs/adapter-static");
+    f2.warn("Please make sure you have the pages: 'dist' and assets: 'dest', in your svelte.config.js adaptater");
+    const doContinue = await se({ message: "Do you want to continue?" });
+    if (!doContinue) {
+      f2.error("Aborted");
+      program.error("");
+    }
+    return "build";
+  }
+  return "build";
+}
 async function findMainFile() {
   const mainRegex = /(main|index)\.(ts|tsx|js|jsx)$/;
   let mainFile = "";
@@ -94951,7 +95017,7 @@ The app size is ${mbSize} Mb, this may take a while to download for users
     }
     try {
       await distribution_default.put(url, {
-        timeout: 2e4,
+        timeout: options.timeout || 12e4,
         retry: 5,
         body: zipped,
         headers: !localS3 ? {
@@ -94961,6 +95027,7 @@ The app size is ${mbSize} Mb, this may take a while to download for users
         } : void 0
       });
     } catch (errorUpload) {
+      spinner.stop("Failed to upload bundle");
       f2.error(`Cannot upload bundle ${formatError(errorUpload)}`);
       await deletedFailedVersion(supabase, appid, bundle2);
       program.error("");
@@ -95419,10 +95486,14 @@ async function step4(userId, snag, apikey, appId) {
     let coreVersion = pack.dependencies["@capacitor/core"] || pack.devDependencies["@capacitor/core"];
     coreVersion = coreVersion?.replace("^", "").replace("~", "");
     if (!coreVersion) {
-      s.stop(`Cannot find @capacitor/core in package.json, please run \`capgo init\` in a capacitor project`);
+      s.stop("Error");
+      f2.warn(`Cannot find @capacitor/core in package.json, please run \`capgo init\` in a capacitor project`);
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     } else if (import_semver.default.lt(coreVersion, "5.0.0")) {
-      s.stop(`@capacitor/core version is ${coreVersion}, please update to Capacitor v5 first: ${urlMigrateV5}`);
+      s.stop("Error");
+      f2.warn(`@capacitor/core version is ${coreVersion}, please update to Capacitor v5 first: ${urlMigrateV5}`);
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     } else if (import_semver.default.lt(coreVersion, "6.0.0")) {
       s.stop(`@capacitor/core version is ${coreVersion}, please update to Capacitor v6: ${urlMigrateV6} to access the best features of Capgo`);
@@ -95430,7 +95501,9 @@ async function step4(userId, snag, apikey, appId) {
     }
     const pm = findPackageManagerType();
     if (pm === "unknown") {
-      s.stop(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm or yarn`);
+      s.stop("Error");
+      f2.warn(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm or yarn`);
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     }
     const installCmd = pm === "yarn" ? "add" : "install";
@@ -95451,9 +95524,16 @@ async function step5(userId, snag, apikey, appId) {
   if (doAddCode) {
     const s = de();
     s.start(`Adding @capacitor-updater to your main file`);
-    const mainFilePath = await findMainFile();
+    const projectType = await findProjectType();
+    let mainFilePath;
+    if (projectType === "unknown")
+      mainFilePath = await findMainFile();
+    else
+      mainFilePath = await findMainFileForProjectType(projectType);
     if (!mainFilePath) {
-      s.stop("No main.ts, main.js, index.ts or index.js file found, You need to add @capgo/capacitor-updater manually");
+      s.stop("Error");
+      f2.warn("Cannot find main file, You need to add @capgo/capacitor-updater manually");
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     }
     const mainFile = (0, import_node_fs11.readFileSync)(mainFilePath);
@@ -95461,7 +95541,9 @@ async function step5(userId, snag, apikey, appId) {
     const matches = mainFileContent.match(regexImport);
     const last = matches?.pop();
     if (!last) {
-      s.stop(`Cannot find import line in main file, use manual installation: https://capgo.app/docs/plugin/installation/`);
+      s.stop("Error");
+      f2.warn(`Cannot find import line in main file, use manual installation: https://capgo.app/docs/plugin/installation/`);
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     }
     if (mainFileContent.includes(codeInject)) {
@@ -95493,7 +95575,9 @@ async function step6(userId, snag, apikey, appId) {
     s.start(`Running: npx @capgo/cli@latest key create`);
     const keyRes = await createKey({ force: true }, false);
     if (!keyRes) {
-      s.stop(`Cannot create key \u274C`);
+      s.stop("Error");
+      f2.warn(`Cannot create key \u274C`);
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit(1);
     } else {
       s.stop(`key created \u{1F511}`);
@@ -95507,13 +95591,17 @@ async function step7(userId, snag, apikey, appId) {
   await cancelCommand2(doBuild, userId, snag);
   if (doBuild) {
     const s = de();
-    s.start(`Running: npm run build && npx cap sync`);
+    const projectType = await findProjectType();
+    const buildCommand = await findBuildCommandForProjectType(projectType);
+    s.start(`Running: npm run ${buildCommand} && npx cap sync`);
     const pack = JSON.parse((0, import_node_fs11.readFileSync)("package.json").toString());
-    if (!pack.scripts?.build) {
-      s.stop(`Cannot find build script in package.json, please add it and run \`capgo init\` again`);
+    if (!pack.scripts[buildCommand]) {
+      s.stop("Error");
+      f2.warn(`Cannot find ${buildCommand} script in package.json, please add it and run \`capgo init\` again`);
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     }
-    (0, import_node_child_process6.execSync)(`npm run build && npx cap sync`, execOption);
+    (0, import_node_child_process6.execSync)(`npm run ${buildCommand} && npx cap sync`, execOption);
     s.stop(`Build & Sync Done \u2705`);
   } else {
     f2.info(`Build yourself with command: npm run build && npx cap sync`);
@@ -95531,7 +95619,9 @@ async function step8(userId, snag, apikey, appId) {
       apikey
     }, false);
     if (!uploadRes) {
-      s.stop(`Upload failed \u274C`);
+      s.stop("Error");
+      f2.warn(`Upload failed \u274C`);
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     } else {
       s.stop(`Upload Done \u2705`);
@@ -95552,8 +95642,10 @@ async function step9(userId, snag) {
         { value: "android", label: "Android" }
       ]
     });
-    if (eD(plaformType))
+    if (eD(plaformType)) {
+      $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
+    }
     const platform2 = plaformType;
     const s = de();
     s.start(`Running: npx cap run ${platform2}`);
@@ -96475,7 +96567,7 @@ var bundle = program.command("bundle").description("Manage bundle");
 bundle.command("upload [appId]").alias("u").description("Upload a new bundle in Capgo Cloud").action(uploadCommand).option("-a, --apikey <apikey>", "apikey to link to your account").option("-p, --path <path>", "path of the folder to upload").option("-c, --channel <channel>", "channel to link to").option("-e, --external <url>", "link to external url intead of upload to Capgo Cloud").option("--iv-session-key <key>", "Set the iv and session key for bundle url external").option("--s3-region <region>", "Region for your AWS S3 bucket").option("--s3-apikey <apikey>", "apikey for your AWS S3 account").option("--s3-apisecret <apisecret>", "api secret for your AWS S3 account").option("--s3-bucket-name <bucketName>", "Name for your AWS S3 bucket").option("--key <key>", "custom path for public signing key").option("--key-data <keyData>", "base64 public signing key").option("--bundle-url", "prints bundle url into stdout").option("--no-key", "ignore signing key and send clear update").option("--no-code-check", "Ignore checking if notifyAppReady() is called in soure code and index present in root folder").option("--display-iv-session", "Show in the console the iv and session key used to encrypt the update").option("-b, --bundle <bundle>", "bundle version number of the bundle to upload").option(
   "--min-update-version <minUpdateVersion>",
   "Minimal version required to update to this version. Used only if the disable auto update is set to metadata in channel"
-).option("--auto-min-update-version", "Set the min update version based on native packages").option("--ignore-metadata-check", "Ignores the metadata (node_modules) check when uploading");
+).option("--auto-min-update-version", "Set the min update version based on native packages").option("--ignore-metadata-check", "Ignores the metadata (node_modules) check when uploading").option("--timeout <timeout>", "Timeout for the upload process in seconds");
 bundle.command("compatibility [appId]").action(checkCompatibilityCommand).option("-a, --apikey <apikey>", "apikey to link to your account").option("-c, --channel <channel>", "channel to check the compatibility with").option("--text", "output text instead of emojis");
 bundle.command("delete [bundleId] [appId]").alias("d").description("Delete a bundle in Capgo Cloud").action(deleteBundle).option("-a, --apikey <apikey>", "apikey to link to your account");
 bundle.command("list [appId]").alias("l").description("List bundle in Capgo Cloud").action(listBundle).option("-a, --apikey <apikey>", "apikey to link to your account");

package/package.json

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

package/src/bundle/upload.ts

@@ -63,6 +63,7 @@ interface Options extends OptionsBase {
   minUpdateVersion?: string
   autoMinUpdateVersion?: boolean
   ignoreMetadataCheck?: boolean
+  timeout?: number
 }
 
 export async function uploadBundle(appid: string, options: Options, shouldExit = true) {
@@ -385,7 +386,7 @@ It will be also visible in your dashboard\n`)
     }
     try {
       await ky.put(url, {
-        timeout: 20000,
+        timeout: options.timeout || 120000,
         retry: 5,
         body: zipped,
         headers: (!localS3
@@ -398,6 +399,7 @@ It will be also visible in your dashboard\n`)
       })
     }
     catch (errorUpload) {
+      spinner.stop('Failed to upload bundle')
       p.log.error(`Cannot upload bundle ${formatError(errorUpload)}`)
       // call delete version on path /delete_failed_version to delete the version
       await deletedFailedVersion(supabase, appid, bundle)

package/src/index.ts

@@ -130,6 +130,7 @@ bundle
   )
   .option('--auto-min-update-version', 'Set the min update version based on native packages')
   .option('--ignore-metadata-check', 'Ignores the metadata (node_modules) check when uploading')
+  .option('--timeout <timeout>', 'Timeout for the upload process in seconds')
 
 bundle
   .command('compatibility [appId]')

package/src/init.ts

@@ -16,7 +16,7 @@ import { login } from './login'
 import { addApp } from './app/add'
 import { checkLatest } from './api/update'
 import type { Options } from './api/app'
-import { convertAppName, createSupabaseClient, findMainFile, findSavedKey, getConfig, useLogSnag, verifyUser } from './utils'
+import { convertAppName, createSupabaseClient, findBuildCommandForProjectType, findMainFile, findMainFileForProjectType, findProjectType, findSavedKey, getConfig, useLogSnag, verifyUser } from './utils'
 
 interface SuperOptions extends Options {
   local: boolean
@@ -92,11 +92,15 @@ async function step4(userId: string, snag: LogSnag, apikey: string, appId: strin
     let coreVersion = pack.dependencies['@capacitor/core'] || pack.devDependencies['@capacitor/core']
     coreVersion = coreVersion?.replace('^', '').replace('~', '')
     if (!coreVersion) {
-      s.stop(`Cannot find @capacitor/core in package.json, please run \`capgo init\` in a capacitor project`)
+      s.stop('Error')
+      p.log.warn(`Cannot find @capacitor/core in package.json, please run \`capgo init\` in a capacitor project`)
+      p.outro(`Bye 👋`)
       process.exit()
     }
     else if (semver.lt(coreVersion, '5.0.0')) {
-      s.stop(`@capacitor/core version is ${coreVersion}, please update to Capacitor v5 first: ${urlMigrateV5}`)
+      s.stop('Error')
+      p.log.warn(`@capacitor/core version is ${coreVersion}, please update to Capacitor v5 first: ${urlMigrateV5}`)
+      p.outro(`Bye 👋`)
       process.exit()
     }
     else if (semver.lt(coreVersion, '6.0.0')) {
@@ -105,7 +109,9 @@ async function step4(userId: string, snag: LogSnag, apikey: string, appId: strin
     }
     const pm = findPackageManagerType()
     if (pm === 'unknown') {
-      s.stop(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm or yarn`)
+      s.stop('Error')
+      p.log.warn(`Cannot reconize package manager, please run \`capgo init\` in a capacitor project with npm, pnpm or yarn`)
+      p.outro(`Bye 👋`)
       process.exit()
     }
     // // use pm to install capgo
@@ -132,9 +138,17 @@ async function step5(userId: string, snag: LogSnag, apikey: string, appId: strin
   if (doAddCode) {
     const s = p.spinner()
     s.start(`Adding @capacitor-updater to your main file`)
-    const mainFilePath = await findMainFile()
+    const projectType = await findProjectType()
+    let mainFilePath
+    if (projectType === 'unknown')
+      mainFilePath = await findMainFile()
+    else
+      mainFilePath = await findMainFileForProjectType(projectType)
+
     if (!mainFilePath) {
-      s.stop('No main.ts, main.js, index.ts or index.js file found, You need to add @capgo/capacitor-updater manually')
+      s.stop('Error')
+      p.log.warn('Cannot find main file, You need to add @capgo/capacitor-updater manually')
+      p.outro(`Bye 👋`)
       process.exit()
     }
     // open main file and inject codeInject
@@ -144,7 +158,9 @@ async function step5(userId: string, snag: LogSnag, apikey: string, appId: strin
     const matches = mainFileContent.match(regexImport)
     const last = matches?.pop()
     if (!last) {
-      s.stop(`Cannot find import line in main file, use manual installation: https://capgo.app/docs/plugin/installation/`)
+      s.stop('Error')
+      p.log.warn(`Cannot find import line in main file, use manual installation: https://capgo.app/docs/plugin/installation/`)
+      p.outro(`Bye 👋`)
       process.exit()
     }
 
@@ -171,7 +187,9 @@ async function step6(userId: string, snag: LogSnag, apikey: string, appId: strin
     s.start(`Running: npx @capgo/cli@latest key create`)
     const keyRes = await createKey({ force: true }, false)
     if (!keyRes) {
-      s.stop(`Cannot create key ❌`)
+      s.stop('Error')
+      p.log.warn(`Cannot create key ❌`)
+      p.outro(`Bye 👋`)
       process.exit(1)
     }
     else {
@@ -187,14 +205,18 @@ async function step7(userId: string, snag: LogSnag, apikey: string, appId: strin
   await cancelCommand(doBuild, userId, snag)
   if (doBuild) {
     const s = p.spinner()
-    s.start(`Running: npm run build && npx cap sync`)
+    const projectType = await findProjectType()
+    const buildCommand = await findBuildCommandForProjectType(projectType)
+    s.start(`Running: npm run ${buildCommand} && npx cap sync`)
     const pack = JSON.parse(readFileSync('package.json').toString())
     // check in script build exist
-    if (!pack.scripts?.build) {
-      s.stop(`Cannot find build script in package.json, please add it and run \`capgo init\` again`)
+    if (!pack.scripts[buildCommand]) {
+      s.stop('Error')
+      p.log.warn(`Cannot find ${buildCommand} script in package.json, please add it and run \`capgo init\` again`)
+      p.outro(`Bye 👋`)
       process.exit()
     }
-    execSync(`npm run build && npx cap sync`, execOption as ExecSyncOptions)
+    execSync(`npm run ${buildCommand} && npx cap sync`, execOption as ExecSyncOptions)
     s.stop(`Build & Sync Done ✅`)
   }
   else {
@@ -214,7 +236,9 @@ async function step8(userId: string, snag: LogSnag, apikey: string, appId: strin
       apikey,
     }, false)
     if (!uploadRes) {
-      s.stop(`Upload failed ❌`)
+      s.stop('Error')
+      p.log.warn(`Upload failed ❌`)
+      p.outro(`Bye 👋`)
       process.exit()
     }
     else {
@@ -238,8 +262,10 @@ async function step9(userId: string, snag: LogSnag) {
         { value: 'android', label: 'Android' },
       ],
     })
-    if (p.isCancel(plaformType))
+    if (p.isCancel(plaformType)) {
+      p.outro(`Bye 👋`)
       process.exit()
+    }
 
     const platform = plaformType as 'ios' | 'android'
     const s = p.spinner()

package/src/utils.ts

@@ -324,6 +324,91 @@ async function* getFiles(dir: string): AsyncGenerator<string> {
       yield res
   }
 }
+
+export async function findProjectType() {
+  // for nuxtjs check if nuxt.config.js exists
+  // for nextjs check if next.config.js exists
+  // for angular check if angular.json exists
+  // for sveltekit check if svelte.config.js exists
+  const pwd = process.cwd()
+  for await (const f of getFiles(pwd)) {
+    // find number of folder in path after pwd
+    if (f.includes('angular.json')) {
+      p.log.info('Found angular project')
+      return 'angular'
+    }
+    if (f.includes('nuxt.config.js')) {
+      p.log.info('Found nuxtjs project')
+      return 'nuxtjs'
+    }
+    if (f.includes('next.config.js')) {
+      p.log.info('Found nextjs project')
+      return 'nextjs'
+    }
+    if (f.includes('svelte.config.js')) {
+      p.log.info('Found sveltekit project')
+      return 'sveltekit'
+    }
+  }
+  return 'unknown'
+}
+
+export async function findMainFileForProjectType(projectType: string) {
+  if (projectType === 'angular')
+    return 'src/main.ts'
+
+  if (projectType === 'nuxtjs')
+    return 'src/main.ts'
+
+  if (projectType === 'nextjs')
+    return 'pages/_app.tsx'
+
+  if (projectType === 'sveltekit')
+    return 'src/main.ts'
+
+  return null
+}
+
+// create a function to find the right command to build the project in static mode depending on the project type
+
+export async function findBuildCommandForProjectType(projectType: string) {
+  if (projectType === 'angular') {
+    p.log.info('Angular project detected')
+    return 'build'
+  }
+
+  if (projectType === 'nuxtjs') {
+    p.log.info('Nuxtjs project detected')
+    return 'generate'
+  }
+
+  if (projectType === 'nextjs') {
+    p.log.info('Nextjs project detected')
+    p.log.warn('Please make sure you have configured static export in your next.config.js: https://nextjs.org/docs/pages/building-your-application/deploying/static-exports')
+    p.log.warn('Please make sure you have the output: \'export\' and distDir: \'dist\' in your next.config.js')
+    const doContinue = await p.confirm({ message: 'Do you want to continue?' })
+    if (!doContinue) {
+      p.log.error('Aborted')
+      program.error('')
+    }
+    return 'build'
+  }
+
+  if (projectType === 'sveltekit') {
+    p.log.info('Sveltekit project detected')
+    p.log.warn('Please make sure you have the adapter-static installed: https://kit.svelte.dev/docs/adapter-static')
+    p.log.warn('Please make sure you have the pages: \'dist\' and assets: \'dest\', in your svelte.config.js adaptater')
+    const doContinue = await p.confirm({ message: 'Do you want to continue?' })
+    if (!doContinue) {
+      p.log.error('Aborted')
+      program.error('')
+    }
+    return 'build'
+  }
+
+  return 'build'
+}
+
 export async function findMainFile() {
   const mainRegex = /(main|index)\.(ts|tsx|js|jsx)$/
   // search for main.ts or main.js in local dir and subdirs