@capgo/cli 4.8.0 → 4.8.1

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.1](https://github.com/Cap-go/CLI/compare/v4.8.0...v4.8.1) (2024-05-11)
+
 ## [4.8.0](https://github.com/Cap-go/CLI/compare/v4.7.0...v4.8.0) (2024-05-10)
 
 

package/dist/index.js

@@ -92373,7 +92373,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.8.0",
+  version: "4.8.1",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -93916,7 +93916,8 @@ async function updateOrCreateVersion(supabase, update) {
 async function uploadUrl(supabase, appId, name) {
   const data = {
     app_id: appId,
-    name
+    name,
+    version: 0
   };
   try {
     const pathUploadLink = "private/upload_link";
@@ -93927,6 +93928,52 @@ async function uploadUrl(supabase, appId, name) {
   }
   return "";
 }
+async function prepareMultipart(supabase, appId, name) {
+  const data = {
+    app_id: appId,
+    name,
+    version: 1
+  };
+  try {
+    const pathUploadLink = "private/upload_link";
+    const res = await supabase.functions.invoke(pathUploadLink, { body: JSON.stringify(data) });
+    return res.data;
+  } catch (error) {
+    f2.error(`Cannot get upload url ${formatError(error)}`);
+    return null;
+  }
+}
+async function finishMultipartDownload(key2, uploadId, url, parts) {
+  const metadata = {
+    action: "mpu-complete",
+    uploadId,
+    key: key2
+  };
+  await distribution_default.post(url, {
+    json: {
+      parts
+    },
+    searchParams: new URLSearchParams({ body: btoa(JSON.stringify(metadata)) })
+  });
+}
+var PART_SIZE = 10 * 1024 * 1024;
+async function uploadMultipart(supabase, appId, name, data) {
+  try {
+    const multipartPrep = await prepareMultipart(supabase, appId, name);
+    if (!multipartPrep) {
+      return false;
+    }
+    const fileSize = data.length;
+    const partCount = Math.ceil(fileSize / PART_SIZE);
+    const uploadPromises = Array.from({ length: partCount }, (_3, index) => uploadPart(data, PART_SIZE, multipartPrep.url, multipartPrep.key, multipartPrep.uploadId, index));
+    const parts = await Promise.all(uploadPromises);
+    await finishMultipartDownload(multipartPrep.key, multipartPrep.uploadId, multipartPrep.url, parts);
+    return true;
+  } catch (e2) {
+    f2.error(`Could not upload via multipart ${formatError(e2)}`);
+    return false;
+  }
+}
 async function deletedFailedVersion(supabase, appId, name) {
   const data = {
     app_id: appId,
@@ -93941,6 +93988,23 @@ async function deletedFailedVersion(supabase, appId, name) {
     return Promise.reject(new Error("Cannot delete failed version"));
   }
 }
+async function uploadPart(data, partsize, url, key2, uploadId, index) {
+  const dataToUpload = data.subarray(
+    partsize * index,
+    partsize * (index + 1)
+  );
+  const metadata = {
+    action: "mpu-uploadpart",
+    uploadId,
+    partNumber: index + 1,
+    key: key2
+  };
+  const response = await distribution_default.put(url, {
+    body: dataToUpload,
+    searchParams: new URLSearchParams({ body: btoa(JSON.stringify(metadata)) })
+  });
+  return await response.json();
+}
 async function updateOrCreateChannel(supabase, update) {
   if (!update.app_id || !update.name || !update.created_by) {
     f2.error("missing app_id, name, or created_by");
@@ -95066,23 +95130,27 @@ The app size is ${mbSize} Mb, this may take a while to download for users
   if (!external && zipped) {
     const spinner = de();
     spinner.start(`Uploading Bundle`);
-    const url = await uploadUrl(supabase, appid, bundle2);
-    if (!url) {
-      f2.error(`Cannot get upload url`);
-      program.error("");
-    }
     const startTime = import_node_perf_hooks.performance.now();
     try {
-      await distribution_default.put(url, {
-        timeout: options.timeout || UPLOAD_TIMEOUT,
-        retry: 5,
-        body: zipped,
-        headers: !localS3 ? {
-          "Content-Type": "application/octet-stream",
-          "Cache-Control": "public, max-age=456789, immutable",
-          "x-amz-meta-crc32": checksum
-        } : void 0
-      });
+      if (options.multipart !== void 0 && options.multipart) {
+        await uploadMultipart(supabase, appid, bundle2, zipped);
+      } else {
+        const url = await uploadUrl(supabase, appid, bundle2);
+        if (!url) {
+          f2.error(`Cannot get upload url`);
+          program.error("");
+        }
+        await distribution_default.put(url, {
+          timeout: options.timeout || UPLOAD_TIMEOUT,
+          retry: 5,
+          body: zipped,
+          headers: !localS3 ? {
+            "Content-Type": "application/octet-stream",
+            "Cache-Control": "public, max-age=456789, immutable",
+            "x-amz-meta-crc32": checksum
+          } : void 0
+        });
+      }
     } catch (errorUpload) {
       const endTime2 = import_node_perf_hooks.performance.now();
       const uploadTime2 = ((endTime2 - startTime) / 1e3).toFixed(2);
@@ -96641,7 +96709,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("--timeout <timeout>", "Timeout for the upload process in seconds");
+).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").option("--multipart", "Uses multipart protocol to upload data to S3");
 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.8.0",
+  "version": "4.8.1",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",

package/src/bundle/upload.ts

@@ -39,6 +39,7 @@ import {
   requireUpdateMetadata,
   updateOrCreateChannel,
   updateOrCreateVersion,
+  uploadMultipart,
   uploadUrl,
   useLogSnag,
   verifyUser,
@@ -66,6 +67,7 @@ interface Options extends OptionsBase {
   autoMinUpdateVersion?: boolean
   ignoreMetadataCheck?: boolean
   timeout?: number
+  multipart?: boolean
 }
 
 const UPLOAD_TIMEOUT = 120000
@@ -381,26 +383,32 @@ It will be also visible in your dashboard\n`)
   if (!external && zipped) {
     const spinner = p.spinner()
     spinner.start(`Uploading Bundle`)
-
-    const url = await uploadUrl(supabase, appid, bundle)
-    if (!url) {
-      p.log.error(`Cannot get upload url`)
-      program.error('')
-    }
     const startTime = performance.now()
+
     try {
-      await ky.put(url, {
-        timeout: options.timeout || UPLOAD_TIMEOUT,
-        retry: 5,
-        body: zipped,
-        headers: (!localS3
-          ? {
-              'Content-Type': 'application/octet-stream',
-              'Cache-Control': 'public, max-age=456789, immutable',
-              'x-amz-meta-crc32': checksum,
-            }
-          : undefined),
-      })
+      if (options.multipart !== undefined && options.multipart) {
+        await uploadMultipart(supabase, appid, bundle, zipped)
+      }
+      else {
+        const url = await uploadUrl(supabase, appid, bundle)
+        if (!url) {
+          p.log.error(`Cannot get upload url`)
+          program.error('')
+        }
+
+        await ky.put(url, {
+          timeout: options.timeout || UPLOAD_TIMEOUT,
+          retry: 5,
+          body: zipped,
+          headers: (!localS3
+            ? {
+                'Content-Type': 'application/octet-stream',
+                'Cache-Control': 'public, max-age=456789, immutable',
+                'x-amz-meta-crc32': checksum,
+              }
+            : undefined),
+        })
+      }
     }
     catch (errorUpload) {
       const endTime = performance.now()
@@ -411,6 +419,7 @@ It will be also visible in your dashboard\n`)
       await deletedFailedVersion(supabase, appid, bundle)
       program.error('')
     }
+
     versionData.storage_provider = 'r2'
     const { error: dbError2 } = await updateOrCreateVersion(supabase, versionData)
     if (dbError2) {

package/src/index.ts

@@ -131,6 +131,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')
+  .option('--multipart', 'Uses multipart protocol to upload data to S3')
 
 bundle
   .command('compatibility [appId]')

package/src/utils.ts

@@ -2,6 +2,7 @@ import { existsSync, readFileSync, readdirSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { resolve } from 'node:path'
 import process from 'node:process'
+import type { Buffer } from 'node:buffer'
 import { loadConfig } from '@capacitor/cli/dist/config'
 import { program } from 'commander'
 import type { SupabaseClient } from '@supabase/supabase-js'
@@ -483,6 +484,7 @@ export async function uploadUrl(supabase: SupabaseClient<Database>, appId: strin
   const data = {
     app_id: appId,
     name,
+    version: 0,
   }
   try {
     const pathUploadLink = 'private/upload_link'
@@ -495,6 +497,67 @@ export async function uploadUrl(supabase: SupabaseClient<Database>, appId: strin
   return ''
 }
 
+async function prepareMultipart(supabase: SupabaseClient<Database>, appId: string, name: string): Promise<{ key: string, uploadId: string, url: string } | null> {
+  const data = {
+    app_id: appId,
+    name,
+    version: 1,
+  }
+  try {
+    const pathUploadLink = 'private/upload_link'
+    const res = await supabase.functions.invoke(pathUploadLink, { body: JSON.stringify(data) })
+    return res.data as any
+  }
+  catch (error) {
+    p.log.error(`Cannot get upload url ${formatError(error)}`)
+    return null
+  }
+}
+
+async function finishMultipartDownload(key: string, uploadId: string, url: string, parts: any[]) {
+  const metadata = {
+    action: 'mpu-complete',
+    uploadId,
+    key,
+  }
+
+  await ky.post(url, {
+    json: {
+      parts,
+    },
+    searchParams: new URLSearchParams({ body: btoa(JSON.stringify(metadata)) }),
+  })
+
+  // console.log(await response.json())
+}
+
+const PART_SIZE = 10 * 1024 * 1024
+export async function uploadMultipart(supabase: SupabaseClient<Database>, appId: string, name: string, data: Buffer): Promise<boolean> {
+  try {
+    const multipartPrep = await prepareMultipart(supabase, appId, name)
+    if (!multipartPrep) {
+      // Just pass the error
+      return false
+    }
+
+    const fileSize = data.length
+    const partCount = Math.ceil(fileSize / PART_SIZE)
+
+    const uploadPromises = Array.from({ length: partCount }, (_, index) =>
+      uploadPart(data, PART_SIZE, multipartPrep.url, multipartPrep.key, multipartPrep.uploadId, index))
+
+    const parts = await Promise.all(uploadPromises)
+
+    await finishMultipartDownload(multipartPrep.key, multipartPrep.uploadId, multipartPrep.url, parts)
+
+    return true
+  }
+  catch (e) {
+    p.log.error(`Could not upload via multipart ${formatError(e)}`)
+    return false
+  }
+}
+
 export async function deletedFailedVersion(supabase: SupabaseClient<Database>, appId: string, name: string): Promise<void> {
   const data = {
     app_id: appId,
@@ -511,6 +574,34 @@ export async function deletedFailedVersion(supabase: SupabaseClient<Database>, a
   }
 }
 
+async function uploadPart(
+  data: Buffer,
+  partsize: number,
+  url: string,
+  key: string,
+  uploadId: string,
+  index: number,
+) {
+  const dataToUpload = data.subarray(
+    partsize * index,
+    partsize * (index + 1),
+  )
+
+  const metadata = {
+    action: 'mpu-uploadpart',
+    uploadId,
+    partNumber: index + 1,
+    key,
+  }
+
+  const response = await ky.put(url, {
+    body: dataToUpload,
+    searchParams: new URLSearchParams({ body: btoa(JSON.stringify(metadata)) }),
+  })
+
+  return await response.json()
+}
+
 export async function updateOrCreateChannel(supabase: SupabaseClient<Database>, update: Database['public']['Tables']['channels']['Insert']) {
   // console.log('updateOrCreateChannel', update)
   if (!update.app_id || !update.name || !update.created_by) {