@capgo/cli 4.12.12 → 4.12.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.12.12",
+  "version": "4.12.14",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",
@@ -44,7 +44,7 @@
     "check-posix-paths": "node test/check-posix-paths.js"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.600.0",
+    "@bradenmacdonald/s3-lite-client": "npm:@jsr/bradenmacdonald__s3-lite-client",
     "@capacitor/cli": "6.1.0",
     "@capgo/find-package-manager": "^0.0.17",
     "@clack/prompts": "^0.7.0",

package/src/bundle/upload.ts

@@ -7,6 +7,7 @@ import { program } from 'commander'
 import { checksum as getChecksum } from '@tomasklaen/checksum'
 import ciDetect from 'ci-info'
 import type LogSnag from 'logsnag'
+import { S3Client } from '@bradenmacdonald/s3-lite-client'
 import ky, { HTTPError } from 'ky'
 import { encryptSource } from '../api/crypto'
 import { type OptionsBase, OrganizationPerm, baseKeyPub, checkChecksum, checkCompatibility, checkPlanValid, convertAppName, createSupabaseClient, deletedFailedVersion, findSavedKey, formatError, getConfig, getLocalConfig, getLocalDepenencies, getOrganizationId, getPMAndCommand, hasOrganizationPerm, regexSemver, updateOrCreateChannel, updateOrCreateVersion, uploadMultipart, uploadUrl, useLogSnag, verifyUser, zipFile } from '../utils'
@@ -27,6 +28,9 @@ interface Options extends OptionsBase {
   s3Apikey?: string
   s3Apisecret?: string
   s3BucketName?: string
+  s3Port?: number
+  s3SSL?: boolean
+  s3Endpoint?: string
   bundleUrl?: boolean
   codeCheck?: boolean
   minUpdateVersion?: string
@@ -395,29 +399,7 @@ export async function uploadBundle(preAppid: string, options: Options, shouldExi
   const pm = getPMAndCommand()
   await checkLatest()
 
-  const { s3Region, s3Apikey, s3Apisecret, s3BucketName } = options
-
-  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('')
-    }
-  }
-
-  if (s3Region && s3Apikey && s3Apisecret && s3BucketName) {
-    p.log.info('Uploading to S3')
-    // const s3Client = new S3Client({
-    //   region: s3Region,
-    //   credentials: {
-    //     accessKeyId: s3Apikey,
-    //     secretAccessKey: s3Apisecret,
-    //   },
-    // })
-    p.log.error('S3 upload is not available we have currenly an issue with it')
-    program.error('')
-    // todo: figure out s3 upload
-    return
-  }
+  const { s3Region, s3Apikey, s3Apisecret, s3BucketName, s3Endpoint, s3Port, s3SSL } = options
 
   const apikey = getApikey(options)
   const config = await getConfig()
@@ -492,7 +474,31 @@ export async function uploadBundle(preAppid: string, options: Options, shouldExi
     program.error('')
   }
 
-  if (zipped) {
+  if (zipped && (s3BucketName || s3Endpoint || s3Region || s3Apikey || s3Apisecret || s3Port || s3SSL)) {
+    if (!s3BucketName || !s3Endpoint || !s3Region || !s3Apikey || !s3Apisecret || !s3Port) {
+      p.log.error('Missing argument, for S3 upload you need to provide a bucket name, endpoint, region, port, API key, and API secret')
+      program.error('')
+    }
+
+    p.log.info('Uploading to S3')
+    const s3Client = new S3Client({
+      endPoint: s3Endpoint,
+      region: s3Region,
+      port: s3Port,
+      useSSL: s3SSL,
+      bucket: s3BucketName,
+      credentials: {
+        accessKeyId: s3Apikey,
+        secretAccessKey: s3Apisecret,
+      },
+    })
+    const fileName = `${appid}-${bundle}`
+    const encodeFileName = encodeURIComponent(fileName)
+    await s3Client.putObject(fileName, zipped)
+    versionData.external_url = `https://${s3Endpoint}/${encodeFileName}`
+    versionData.storage_provider = 'external'
+  }
+  else if (zipped) {
     await uploadBundleToCapgoCloud(supabase, appid, bundle, orgId, zipped, options)
 
     versionData.storage_provider = 'r2'

package/src/index.ts

@@ -114,10 +114,13 @@ 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-region <region>', 'Region for your S3 bucket')
+  .option('--s3-apikey <apikey>', 'Apikey for your S3 endpoint')
+  .option('--s3-apisecret <apisecret>', 'Api secret for your S3 endpoint')
+  .option('--s3-endoint <s3Endpoint>', 'Url of S3 endpoint')
   .option('--s3-bucket-name <bucketName>', 'Name for your AWS S3 bucket')
+  .option('--s3-port <port>', 'Port for your S3 endpoint')
+  .option('--no-s3-ssl', 'Disable SSL for S3 upload')
   .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')