@capgo/cli 4.2.12 → 4.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.2.12",
+  "version": "4.3.2",
   "description": "A CLI to upload to capgo servers",
   "main": "dist/index.js",
   "bin": {
@@ -43,6 +43,7 @@
   "author": "github.com/riderx",
   "license": "Apache 2.0",
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.540.0",
     "@capacitor/cli": "5.7.0",
     "@capgo/find-package-manager": "0.0.10",
     "@clack/prompts": "^0.7.0",

package/src/app/add.ts

@@ -39,8 +39,6 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
 
   let userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
 
-  await checkPlanValid(supabase, userId, options.apikey, undefined, false)
-
   // Check we have app access to this appId
   const appExist = await checkAppExists(supabase, appId)
   if (throwErr && appExist) {
@@ -82,6 +80,8 @@ export async function addApp(appId: string, options: Options, throwErr = true) {
 
   p.log.info(`Using the organization "${organization.name}" as the app owner`)
 
+  await checkPlanValid(supabase, organizationUid, options.apikey, undefined, false)
+
   let { name, icon } = options
   appId = appId || config?.app?.appId
   name = name || config?.app?.appName || 'Unknown'

package/src/bundle/unlink.ts

@@ -15,6 +15,7 @@ import {
   findSavedKey,
   formatError,
   getConfig,
+  getOrganizationId,
   useLogSnag,
   verifyUser,
 } from '../utils'
@@ -47,7 +48,11 @@ export async function unlinkDevice(channel: string, appId: string, options: Opti
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['all', 'write'])
+  const [userId, orgId] = await Promise.all([
+    verifyUser(supabase, options.apikey, ['all', 'write']),
+    getOrganizationId(supabase, appId),
+  ])
+
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.write)
 
@@ -56,7 +61,7 @@ export async function unlinkDevice(channel: string, appId: string, options: Opti
     program.error('')
   }
   try {
-    await checkPlanValid(supabase, userId, options.apikey, appId)
+    await checkPlanValid(supabase, orgId, options.apikey, appId)
 
     const versionData = await getVersionData(supabase, appId, bundle)
     await checkVersionNotUsedInChannel(supabase, appId, versionData)

package/src/bundle/upload.ts

@@ -8,6 +8,10 @@ import * as p from '@clack/prompts'
 import { checksum as getChecksum } from '@tomasklaen/checksum'
 import ciDetect from 'ci-info'
 import ky from 'ky'
+import {
+  PutObjectCommand,
+  S3Client,
+} from '@aws-sdk/client-s3'
 import { checkLatest } from '../api/update'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { encryptSource } from '../api/crypto'
@@ -28,6 +32,7 @@ import {
   getConfig,
   getLocalConfig,
   getLocalDepenencies,
+  getOrganizationId,
   hasOrganizationPerm,
   regexSemver,
   requireUpdateMetadata,
@@ -50,6 +55,10 @@ interface Options extends OptionsBase {
   key?: boolean | string
   keyData?: string
   ivSessionKey?: string
+  s3Region?: string
+  s3Apikey?: string
+  s3Apisecret?: string
+  s3BucketName?: string
   bundleUrl?: boolean
   codeCheck?: boolean
   minUpdateVersion?: string
@@ -63,6 +72,21 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   let { bundle, path, channel } = options
   const { external, key, displayIvSession, autoMinUpdateVersion, ignoreMetadataCheck } = options
   let { minUpdateVersion } = options
+  const { s3Region, s3Apikey, s3Apisecret, s3BucketName } = options
+  let useS3 = false
+  let s3Client
+  if (s3Region && s3Apikey && s3Apisecret && s3BucketName) {
+    p.log.info('Uploading to S3')
+    useS3 = true
+    s3Client = new S3Client({
+      region: s3Region,
+      credentials: {
+        accessKeyId: s3Apikey,
+        secretAccessKey: s3Apisecret,
+      },
+    })
+  }
+
   options.apikey = options.apikey || findSavedKey()
   const snag = useLogSnag()
 
@@ -91,6 +115,13 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
     p.log.error('Missing argument, you need to provide a appid and a bundle and a path, or be in a capacitor project')
     program.error('')
   }
+  // if one S3 variable is set, check that all are set
+  if (s3BucketName || s3Region || s3Apikey || s3Apisecret) {
+    if (!s3BucketName || !s3Region || !s3Apikey || !s3Apisecret) {
+      p.log.error('Missing argument, for S3 upload you need to provide a bucket name, region, API key, and API secret')
+      program.error('')
+    }
+  }
   // check if path exist
   if (!existsSync(path)) {
     p.log.error(`Path ${path} does not exist, build your app first, or provide a valid path`)
@@ -119,7 +150,10 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   // await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid);
 
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.upload)
-  await checkPlanValid(supabase, userId, options.apikey, appid, true)
+
+  // 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)
 
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel, appid)
 
@@ -197,11 +231,12 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   }
 
   const { data: isTrial, error: isTrialsError } = await supabase
-    .rpc('is_trial', { userid: userId })
+    .rpc('is_trial_org', { orgid: orgId })
     .single()
   if ((isTrial && isTrial > 0) || isTrialsError) {
+    // TODO: Come back to this to fix for orgs v3
     p.log.warn(`WARNING !!\nTrial expires in ${isTrial} days`)
-    p.log.warn(`Upgrade here: ${localConfig.hostWeb}/dashboard/settings/plans`)
+    p.log.warn(`Upgrade here: ${localConfig.hostWeb}/dashboard/settings/plans?oid=${orgId}`)
   }
 
   // check if app already exist
@@ -217,7 +252,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   let sessionKey
   let checksum = ''
   let zipped: Buffer | null = null
-  if (!external) {
+  if (!external && useS3 === false) {
     const zip = new AdmZip()
     zip.addLocalFolder(path)
     zipped = zip.toBuffer()
@@ -292,6 +327,15 @@ It will be also visible in your dashboard\n`)
     program.error('')
   }
   else {
+    if (useS3) {
+      const zip = new AdmZip()
+      zip.addLocalFolder(path)
+      zipped = zip.toBuffer()
+      const s = p.spinner()
+      s.start(`Calculating checksum`)
+      checksum = await getChecksum(zipped, 'crc32')
+      s.stop(`Checksum: ${checksum}`)
+    }
     await snag.track({
       channel: 'app',
       event: 'App external',
@@ -361,6 +405,33 @@ It will be also visible in your dashboard\n`)
     }
     spinner.stop('Bundle Uploaded 💪')
   }
+  else if (useS3 && zipped) {
+    const spinner = p.spinner()
+    spinner.start(`Uploading Bundle`)
+
+    const fileName = `${appid}-${bundle}`
+    const encodeFileName = encodeURIComponent(fileName)
+    const command: PutObjectCommand = new PutObjectCommand({
+      Bucket: s3BucketName,
+      Key: fileName,
+      Body: zipped,
+    })
+
+    const response = await s3Client.send(command)
+    if (response.$metadata.httpStatusCode !== 200) {
+      p.log.error(`Cannot upload to S3`)
+      program.error('')
+    }
+
+    versionData.storage_provider = 'external'
+    versionData.external_url = `https://${s3BucketName}.s3.amazonaws.com/${encodeFileName}`
+    const { error: dbError2 } = await updateOrCreateVersion(supabase, versionData)
+    if (dbError2) {
+      p.log.error(`Cannot update bundle ${formatError(dbError2)}`)
+      program.error('')
+    }
+    spinner.stop('Bundle Uploaded 💪')
+  }
   const { data: versionId } = await supabase
     .rpc('get_app_versions', { apikey: options.apikey, name_version: bundle, appid })
     .single()

package/src/channel/set.ts

@@ -13,6 +13,7 @@ import {
   findSavedKey,
   formatError,
   getConfig,
+  getOrganizationId,
   updateOrCreateChannel,
   useLogSnag,
   verifyUser,
@@ -53,6 +54,7 @@ export async function setChannel(channel: string, appId: string, options: Option
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.admin)
+  const orgId = await getOrganizationId(supabase, appId)
 
   const { bundle, latest, downgrade, upgrade, ios, android, selfAssign, state, disableAutoUpdate } = options
   if (!channel) {
@@ -76,7 +78,7 @@ export async function setChannel(channel: string, appId: string, options: Option
     program.error('')
   }
   try {
-    await checkPlanValid(supabase, userId, options.apikey, appId)
+    await checkPlanValid(supabase, orgId, options.apikey, appId)
     const channelPayload: Database['public']['Tables']['channels']['Insert'] = {
       created_by: userId,
       app_id: appId,

package/src/index.ts

@@ -113,6 +113,10 @@ bundle
   .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')