@capgo/cli 4.6.2 → 4.7.0

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.7.0](https://github.com/Cap-go/CLI/compare/v4.6.3...v4.7.0) (2024-05-10)
+
+
+### Features
+
+* add upload time + correct PM name ([af61757](https://github.com/Cap-go/CLI/commit/af6175751d92070088d4569b892a333a3e1a1063))
+
+### [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)
 
 

package/dist/index.js

@@ -92373,7 +92373,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.6.2",
+  version: "4.7.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.11",
+    "@capgo/find-package-manager": "^0.0.13",
     "@clack/prompts": "^0.7.0",
     "@supabase/supabase-js": "^2.42.7",
     "@tomasklaen/checksum": "^1.1.0",
@@ -93536,6 +93536,44 @@ var distribution_default = ky;
 
 // src/utils.ts
 var import_node_dir = __toESM(require_node_dir());
+
+// node_modules/@capgo/find-package-manager/main.js
+var import_fs = require("fs");
+var findPackageManagerType = (path3 = ".", defaultPackageManager = "unknown") => {
+  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 "bun";
+  }
+  if ((0, import_fs.existsSync)(pnpmPath)) {
+    return "pnpm";
+  }
+  if ((0, import_fs.existsSync)(yarnPath)) {
+    return "yarn";
+  }
+  if ((0, import_fs.existsSync)(npmPath)) {
+    return "npm";
+  }
+  return defaultPm;
+};
+var findInstallCommand = (packageManagerType = findPackageManagerType()) => {
+  switch (packageManagerType) {
+    case "bun":
+      return "install";
+    case "pnpm":
+      return "install";
+    case "yarn":
+      return "add";
+    case "npm":
+      return "install";
+    default:
+      return "install";
+  }
+};
+
+// src/utils.ts
 var baseKey = ".capgo_key";
 var baseKeyPub = `${baseKey}.pub`;
 var defaultHost = "https://capgo.app";
@@ -93973,7 +94011,9 @@ async function getLocalDepenencies() {
     }
   }
   if (!(0, import_node_fs4.existsSync)("./node_modules/")) {
-    f2.error("Missing node_modules folder, please run npm install");
+    const pm = findPackageManagerType(".", "npm");
+    const installCmd = findInstallCommand(pm);
+    f2.error(`Missing node_modules folder, please run ${pm} ${installCmd}`);
     program.error("");
   }
   let anyInvalid = false;
@@ -93981,7 +94021,9 @@ async function getLocalDepenencies() {
     const dependencyFolderExists = (0, import_node_fs4.existsSync)(`./node_modules/${key2}`);
     if (!dependencyFolderExists) {
       anyInvalid = true;
-      f2.error(`Missing dependency ${key2}, please run npm install`);
+      const pm = findPackageManagerType(".", "npm");
+      const installCmd = findInstallCommand(pm);
+      f2.error(`Missing dependency ${key2}, please run ${pm} ${installCmd}`);
       return { name: key2, version: value };
     }
     let hasNativeFiles = false;
@@ -94213,30 +94255,6 @@ The app size is ${mbSize} Mb, this may take a while to download for users
 var import_node_fs11 = require("node:fs");
 var import_node_child_process6 = require("node:child_process");
 var import_node_process16 = __toESM(require("node:process"));
-
-// node_modules/@capgo/find-package-manager/main.js
-var import_fs = require("fs");
-var findPackageManagerType = (path3 = ".") => {
-  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 "bun";
-  }
-  if ((0, import_fs.existsSync)(pnpmPath)) {
-    return "pnpm";
-  }
-  if ((0, import_fs.existsSync)(yarnPath)) {
-    return "yarn";
-  }
-  if ((0, import_fs.existsSync)(npmPath)) {
-    return "npm";
-  }
-  return "unknown";
-};
-
-// src/init.ts
 var import_semver = __toESM(require_semver4());
 
 // src/app/debug.ts
@@ -94752,11 +94770,13 @@ async function addChannelCommand(apikey, appId, options) {
 var import_node_crypto3 = require("node:crypto");
 var import_node_fs8 = require("node:fs");
 var import_node_process13 = __toESM(require("node:process"));
+var import_node_perf_hooks = require("node:perf_hooks");
 var import_adm_zip2 = __toESM(require_adm_zip());
 var import_checksum2 = __toESM(require_dist());
 var import_ci_info = __toESM(require_ci_info());
 var import_client_s3 = __toESM(require_dist_cjs71());
 var alertMb2 = 20;
+var UPLOAD_TIMEOUT = 12e4;
 async function uploadBundle(appid, options, shouldExit = true) {
   oe(`Uploading`);
   await checkLatest();
@@ -95015,9 +95035,10 @@ The app size is ${mbSize} Mb, this may take a while to download for users
       f2.error(`Cannot get upload url`);
       program.error("");
     }
+    const startTime = import_node_perf_hooks.performance.now();
     try {
       await distribution_default.put(url, {
-        timeout: 2e4,
+        timeout: options.timeout || UPLOAD_TIMEOUT,
         retry: 5,
         body: zipped,
         headers: !localS3 ? {
@@ -95027,6 +95048,9 @@ The app size is ${mbSize} Mb, this may take a while to download for users
         } : void 0
       });
     } catch (errorUpload) {
+      const endTime2 = import_node_perf_hooks.performance.now();
+      const uploadTime2 = ((endTime2 - startTime) / 1e3).toFixed(2);
+      spinner.stop(`Failed to upload bundle ( after ${uploadTime2} seconds)`);
       f2.error(`Cannot upload bundle ${formatError(errorUpload)}`);
       await deletedFailedVersion(supabase, appid, bundle2);
       program.error("");
@@ -95037,7 +95061,9 @@ The app size is ${mbSize} Mb, this may take a while to download for users
       f2.error(`Cannot update bundle ${formatError(dbError2)}`);
       program.error("");
     }
-    spinner.stop("Bundle Uploaded \u{1F4AA}");
+    const endTime = import_node_perf_hooks.performance.now();
+    const uploadTime = ((endTime - startTime) / 1e3).toFixed(2);
+    spinner.stop(`Bundle Uploaded \u{1F4AA} (${uploadTime} seconds)`);
   } else if (useS3 && zipped && s3Client) {
     const spinner = de();
     spinner.start(`Uploading Bundle`);
@@ -95048,6 +95074,7 @@ The app size is ${mbSize} Mb, this may take a while to download for users
       Key: fileName,
       Body: zipped
     });
+    const startTime = import_node_perf_hooks.performance.now();
     const response = await s3Client.send(command);
     if (response.$metadata.httpStatusCode !== 200) {
       f2.error(`Cannot upload to S3`);
@@ -95060,7 +95087,9 @@ The app size is ${mbSize} Mb, this may take a while to download for users
       f2.error(`Cannot update bundle ${formatError(dbError2)}`);
       program.error("");
     }
-    spinner.stop("Bundle Uploaded \u{1F4AA}");
+    const endTime = import_node_perf_hooks.performance.now();
+    const uploadTime = ((endTime - startTime) / 1e3).toFixed(2);
+    spinner.stop(`Bundle Uploaded \u{1F4AA} (${uploadTime} seconds)`);
   }
   const { data: versionId } = await supabase.rpc("get_app_versions", { apikey: options.apikey, name_version: bundle2, appid }).single();
   if (versionId && hasOrganizationPerm(permissions, 3 /* write */)) {
@@ -95505,7 +95534,7 @@ async function step4(userId, snag, apikey, appId) {
       $e(`Bye \u{1F44B}`);
       import_node_process16.default.exit();
     }
-    const installCmd = pm === "yarn" ? "add" : "install";
+    const installCmd = findInstallCommand(pm);
     if (pack.dependencies["@capgo/capacitor-updater"]) {
       s.stop(`Capgo already installed \u2705`);
     } else {
@@ -96566,7 +96595,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.2",
+  "version": "4.7.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.11",
+    "@capgo/find-package-manager": "^0.0.13",
     "@clack/prompts": "^0.7.0",
     "@supabase/supabase-js": "^2.42.7",
     "@tomasklaen/checksum": "^1.1.0",

package/src/bundle/upload.ts

@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto'
 import { existsSync, readFileSync } from 'node:fs'
 import process from 'node:process'
 import type { Buffer } from 'node:buffer'
+import { performance } from 'node:perf_hooks'
 import AdmZip from 'adm-zip'
 import { program } from 'commander'
 import * as p from '@clack/prompts'
@@ -63,8 +64,11 @@ interface Options extends OptionsBase {
   minUpdateVersion?: string
   autoMinUpdateVersion?: boolean
   ignoreMetadataCheck?: boolean
+  timeout?: number
 }
 
+const UPLOAD_TIMEOUT = 120000
+
 export async function uploadBundle(appid: string, options: Options, shouldExit = true) {
   p.intro(`Uploading`)
   await checkLatest()
@@ -383,9 +387,10 @@ It will be also visible in your dashboard\n`)
       p.log.error(`Cannot get upload url`)
       program.error('')
     }
+    const startTime = performance.now()
     try {
       await ky.put(url, {
-        timeout: 20000,
+        timeout: options.timeout || UPLOAD_TIMEOUT,
         retry: 5,
         body: zipped,
         headers: (!localS3
@@ -398,6 +403,9 @@ It will be also visible in your dashboard\n`)
       })
     }
     catch (errorUpload) {
+      const endTime = performance.now()
+      const uploadTime = ((endTime - startTime) / 1000).toFixed(2)
+      spinner.stop(`Failed to upload bundle ( after ${uploadTime} seconds)`)
       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)
@@ -409,7 +417,9 @@ It will be also visible in your dashboard\n`)
       p.log.error(`Cannot update bundle ${formatError(dbError2)}`)
       program.error('')
     }
-    spinner.stop('Bundle Uploaded 💪')
+    const endTime = performance.now()
+    const uploadTime = ((endTime - startTime) / 1000).toFixed(2)
+    spinner.stop(`Bundle Uploaded 💪 (${uploadTime} seconds)`)
   }
   else if (useS3 && zipped && s3Client) {
     const spinner = p.spinner()
@@ -422,7 +432,7 @@ It will be also visible in your dashboard\n`)
       Key: fileName,
       Body: zipped,
     })
-
+    const startTime = performance.now()
     const response = await s3Client.send(command)
     if (response.$metadata.httpStatusCode !== 200) {
       p.log.error(`Cannot upload to S3`)
@@ -436,7 +446,9 @@ It will be also visible in your dashboard\n`)
       p.log.error(`Cannot update bundle ${formatError(dbError2)}`)
       program.error('')
     }
-    spinner.stop('Bundle Uploaded 💪')
+    const endTime = performance.now()
+    const uploadTime = ((endTime - startTime) / 1000).toFixed(2)
+    spinner.stop(`Bundle Uploaded 💪 (${uploadTime} seconds)`)
   }
   const { data: versionId } = await supabase
     .rpc('get_app_versions', { apikey: options.apikey, name_version: bundle, appid })

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

@@ -2,7 +2,7 @@ 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 { findPackageManagerType } from '@capgo/find-package-manager'
+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'
@@ -116,7 +116,7 @@ async function step4(userId: string, snag: LogSnag, apikey: string, appId: strin
     }
     // // use pm to install capgo
     // // run command pm install @capgo/capacitor-updater@latest
-    const installCmd = pm === 'yarn' ? 'add' : 'install'
+    const installCmd = findInstallCommand(pm)
     //  check if capgo is already installed in package.json
     if (pack.dependencies['@capgo/capacitor-updater']) {
       s.stop(`Capgo already installed ✅`)

package/src/utils.ts

@@ -11,6 +11,7 @@ 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 { Database } from './types/supabase.types'
 
 export const baseKey = '.capgo_key'
@@ -654,7 +655,9 @@ export async function getLocalDepenencies() {
   }
 
   if (!existsSync('./node_modules/')) {
-    p.log.error('Missing node_modules folder, please run npm install')
+    const pm = findPackageManagerType('.', 'npm')
+    const installCmd = findInstallCommand(pm)
+    p.log.error(`Missing node_modules folder, please run ${pm} ${installCmd}`)
     program.error('')
   }
 
@@ -667,7 +670,9 @@ export async function getLocalDepenencies() {
 
       if (!dependencyFolderExists) {
         anyInvalid = true
-        p.log.error(`Missing dependency ${key}, please run npm install`)
+        const pm = findPackageManagerType('.', 'npm')
+        const installCmd = findInstallCommand(pm)
+        p.log.error(`Missing dependency ${key}, please run ${pm} ${installCmd}`)
         return { name: key, version: value }
       }