@capgo/cli 4.10.52 → 4.10.65-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.10.52",
+  "version": "4.10.65-beta.1",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",
@@ -58,6 +58,7 @@
     "console-table-printer": "^2.12.1",
     "get-latest-version": "^5.1.0",
     "is-wsl": "^3.1.0",
+    "jszip": "^3.10.1",
     "ky": "^1.3.0",
     "logsnag": "1.0.0",
     "mime": "^4.0.3",

package/src/bundle/upload.ts

@@ -256,7 +256,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   let checksum = ''
   let zipped: Buffer | null = null
   if (!external && useS3 === false) {
-    zipped = zipFile(path)
+    zipped = await zipFile(path)
     const s = p.spinner()
     s.start(`Calculating checksum`)
     checksum = await getChecksum(zipped, 'crc32')
@@ -329,7 +329,7 @@ It will be also visible in your dashboard\n`)
   }
   else {
     if (useS3) {
-      zipped = zipFile(path)
+      zipped = await zipFile(path)
       const s = p.spinner()
       s.start(`Calculating checksum`)
       checksum = await getChecksum(zipped, 'crc32')

package/src/bundle/zip.ts

@@ -28,110 +28,116 @@ interface Options extends OptionsBase {
 }
 
 export async function zipBundle(appId: string, options: Options) {
-  let { bundle, path } = options
-  const { json } = options
-  const snag = useLogSnag()
-  if (!json)
-    await checkLatest()
-
-  const config = await getConfig()
-  appId = appId || config?.app?.appId
-  // create bundle name format : 1.0.0-beta.x where x is a uuid
-  const uuid = randomUUID().split('-')[0]
-  bundle = bundle || config?.app?.package?.version || `0.0.1-beta.${uuid}`
-  if (!json)
-    p.intro(`Zipping ${appId}@${bundle}`)
-    // check if bundle is valid
-  if (!regexSemver.test(bundle)) {
+  try {
+    let { bundle, path } = options
+    const { json } = options
+    const snag = useLogSnag()
     if (!json)
-      p.log.error(`Your bundle name ${bundle}, is not valid it should follow semver convention : https://semver.org/`)
-    else
-      console.error(formatError({ error: 'invalid_semver' }))
-    program.error('')
-  }
-  path = path || config?.app?.webDir
-  if (!appId || !bundle || !path) {
+      await checkLatest()
+
+    const config = await getConfig()
+    appId = appId || config?.app?.appId
+    // create bundle name format : 1.0.0-beta.x where x is a uuid
+    const uuid = randomUUID().split('-')[0]
+    bundle = bundle || config?.app?.package?.version || `0.0.1-beta.${uuid}`
     if (!json)
-      p.log.error('Missing argument, you need to provide a appId and a bundle and a path, or be in a capacitor project')
-    else
-      console.error(formatError({ error: 'missing_argument' }))
-    program.error('')
-  }
-  if (!json)
-    p.log.info(`Started from path "${path}"`)
-  const checkNotifyAppReady = options.codeCheck
-  if (typeof checkNotifyAppReady === 'undefined' || checkNotifyAppReady) {
-    const isPluginConfigured = searchInDirectory(path, 'notifyAppReady')
-    if (!isPluginConfigured) {
+      p.intro(`Zipping ${appId}@${bundle}`)
+    // check if bundle is valid
+    if (!regexSemver.test(bundle)) {
       if (!json)
-        p.log.error(`notifyAppReady() is missing in the source code. see: https://capgo.app/docs/plugin/api/#notifyappready`)
+        p.log.error(`Your bundle name ${bundle}, is not valid it should follow semver convention : https://semver.org/`)
       else
-        console.error(formatError({ error: 'notifyAppReady_not_in_source_code' }))
+        console.error(formatError({ error: 'invalid_semver' }))
       program.error('')
     }
-    const foundIndex = checkIndexPosition(path)
-    if (!foundIndex) {
+    path = path || config?.app?.webDir
+    if (!appId || !bundle || !path) {
       if (!json)
-        p.log.error(`index.html is missing in the root folder or in the only folder in the root folder`)
+        p.log.error('Missing argument, you need to provide a appId and a bundle and a path, or be in a capacitor project')
       else
-        console.error(formatError({ error: 'index_html_not_found' }))
+        console.error(formatError({ error: 'missing_argument' }))
       program.error('')
     }
-  }
-  const zipped = zipFile(path)
-  if (!json)
-    p.log.info(`Zipped ${zipped.byteLength} bytes`)
-  const s = p.spinner()
-  if (!json)
-    s.start(`Calculating checksum`)
-  const checksum = await getChecksum(zipped, 'crc32')
-  if (!json)
-    s.stop(`Checksum: ${checksum}`)
-  const mbSize = Math.floor(zipped.byteLength / 1024 / 1024)
-  // We do not issue this warning for json
-  if (mbSize > alertMb && !json) {
-    p.log.warn(`WARNING !!\nThe app size is ${mbSize} Mb, this may take a while to download for users\n`)
-    p.log.warn(`Learn how to optimize your assets https://capgo.app/blog/optimise-your-images-for-updates/\n`)
+    if (!json)
+      p.log.info(`Started from path "${path}"`)
+    const checkNotifyAppReady = options.codeCheck
+    if (typeof checkNotifyAppReady === 'undefined' || checkNotifyAppReady) {
+      const isPluginConfigured = searchInDirectory(path, 'notifyAppReady')
+      if (!isPluginConfigured) {
+        if (!json)
+          p.log.error(`notifyAppReady() is missing in the source code. see: https://capgo.app/docs/plugin/api/#notifyappready`)
+        else
+          console.error(formatError({ error: 'notifyAppReady_not_in_source_code' }))
+        program.error('')
+      }
+      const foundIndex = checkIndexPosition(path)
+      if (!foundIndex) {
+        if (!json)
+          p.log.error(`index.html is missing in the root folder or in the only folder in the root folder`)
+        else
+          console.error(formatError({ error: 'index_html_not_found' }))
+        program.error('')
+      }
+    }
+    const zipped = await zipFile(path)
+    if (!json)
+      p.log.info(`Zipped ${zipped.byteLength} bytes`)
+    const s = p.spinner()
+    if (!json)
+      s.start(`Calculating checksum`)
+    const checksum = await getChecksum(zipped, 'crc32')
+    if (!json)
+      s.stop(`Checksum: ${checksum}`)
+    const mbSize = Math.floor(zipped.byteLength / 1024 / 1024)
+    // We do not issue this warning for json
+    if (mbSize > alertMb && !json) {
+      p.log.warn(`WARNING !!\nThe app size is ${mbSize} Mb, this may take a while to download for users\n`)
+      p.log.warn(`Learn how to optimize your assets https://capgo.app/blog/optimise-your-images-for-updates/\n`)
+      await snag.track({
+        channel: 'app-error',
+        event: 'App Too Large',
+        icon: '🚛',
+        tags: {
+          'app-id': appId,
+        },
+        notify: false,
+      }).catch()
+    }
+    const s2 = p.spinner()
+    const name = options.name || `${appId}_${bundle}.zip`
+    if (!json)
+      s2.start(`Saving to ${name}`)
+    writeFileSync(name, zipped)
+    if (!json)
+      s2.stop(`Saved to ${name}`)
+
     await snag.track({
-      channel: 'app-error',
-      event: 'App Too Large',
-      icon: '🚛',
+      channel: 'app',
+      event: 'App zip',
+      icon: '⏫',
       tags: {
         'app-id': appId,
       },
       notify: false,
     }).catch()
-  }
-  const s2 = p.spinner()
-  const name = options.name || `${appId}_${bundle}.zip`
-  if (!json)
-    s2.start(`Saving to ${name}`)
-  writeFileSync(name, zipped)
-  if (!json)
-    s2.stop(`Saved to ${name}`)
-
-  await snag.track({
-    channel: 'app',
-    event: 'App zip',
-    icon: '⏫',
-    tags: {
-      'app-id': appId,
-    },
-    notify: false,
-  }).catch()
 
-  if (!json)
-    p.outro(`Done ✅`)
+    if (!json)
+      p.outro(`Done ✅`)
 
-  if (json) {
-    const output = {
-      bundle,
-      filename: name,
-      checksum,
+    if (json) {
+      const output = {
+        bundle,
+        filename: name,
+        checksum,
+      }
+      // Keep the console log and stringify for user who parse the output
+      // eslint-disable-next-line no-console
+      console.log(JSON.stringify(output, null, 2))
     }
-    // Keep the console log and stringify for user who parse the output
-    // eslint-disable-next-line no-console
-    console.log(JSON.stringify(output, null, 2))
+    process.exit()
+  }
+  catch (error) {
+    p.log.error(formatError(error))
+    program.error('')
   }
-  process.exit()
 }

package/src/init.ts

@@ -2,6 +2,7 @@ import { readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
 import type { ExecSyncOptions } from 'node:child_process'
 import { execSync, spawnSync } from 'node:child_process'
 import process from 'node:process'
+import { tmpdir } from 'node:os'
 import * as p from '@clack/prompts'
 import type LogSnag from 'logsnag'
 import semver from 'semver'

package/src/utils.ts

@@ -1,6 +1,6 @@
-import { existsSync, readFileSync, readdirSync } from 'node:fs'
-import os, { homedir } from 'node:os'
-import { resolve } from 'node:path'
+import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join, resolve, sep } from 'node:path'
 import process from 'node:process'
 import type { Buffer } from 'node:buffer'
 import { loadConfig } from '@capacitor/cli/dist/config'
@@ -15,8 +15,9 @@ import { promiseFiles } from 'node-dir'
 import { findRootSync } from '@manypkg/find-root'
 import type { InstallCommand, PackageManagerRunner, PackageManagerType } from '@capgo/find-package-manager'
 import { findInstallCommand, findPackageManagerRunner, findPackageManagerType } from '@capgo/find-package-manager'
-import AdmZip from 'adm-zip'
-import isWsl from 'is-wsl'
+// import AdmZip from 'adm-zip'
+// import isWsl from 'is-wsl'
+import JSZip from 'jszip'
 import type { Database } from './types/supabase.types'
 
 export const baseKey = '.capgo_key'
@@ -518,17 +519,46 @@ async function prepareMultipart(supabase: SupabaseClient<Database>, appId: strin
   }
 }
 
-export function zipFile(filePath: string) {
-  //  if windows and not wsl then do error
-  if (os.release().toLowerCase().includes('microsoft') && !isWsl) {
-    p.log.error(`Windows powershell is not supported, please use WSL or a Linux distribution`)
-    program.error('')
+export async function zipFile(filePath: string): Promise<Buffer> {
+  const zip = new JSZip()
+
+  // Helper function to recursively add files and folders to the ZIP archive
+  const addToZip = async (folderPath: string, zipPath: string) => {
+    const items = readdirSync(folderPath)
+
+    for (const item of items) {
+      const itemPath = join(folderPath, item)
+      const stats = statSync(itemPath)
+
+      if (stats.isFile()) {
+        const fileContent = await readFileSync(itemPath)
+        zip.file(join(zipPath, item).split(sep).join('/'), fileContent)
+      }
+      else if (stats.isDirectory()) {
+        await addToZip(itemPath, join(zipPath, item))
+      }
+    }
   }
-  const zip = new AdmZip()
-  zip.addLocalFolder(filePath)
-  return zip.toBuffer()
+
+  // Start adding files and folders to the ZIP archive
+  await addToZip(filePath, '')
+
+  // Generate the ZIP file as a Buffer
+  const zipBuffer = await zip.generateAsync({ type: 'nodebuffer', platform: 'UNIX' })
+  return zipBuffer
 }
 
+// export function zipFile(filePath: string) {
+//   //  if windows and not wsl then do error
+//   if (os.release().toLowerCase().includes('microsoft') && !isWsl) {
+//     p.log.error(`Windows powershell is not supported, please use WSL or a Linux distribution`)
+//     program.error('')
+//   }
+//   const zip = new AdmZip()
+//   zip.addLocalFolder(filePath)
+//   return zip.toBuffer()
+// }
+
 async function finishMultipartDownload(key: string, uploadId: string, url: string, parts: any[]) {
   const metadata = {
     action: 'mpu-complete',

package/test/VerifyZip.java

@@ -1,6 +1,9 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -12,18 +15,63 @@ public class VerifyZip {
         }
 
         String zipFilePath = args[0];
-        File file = new File(zipFilePath);
+        File zipFile = new File(zipFilePath);
+        File targetDirectory = new File("extracted");
 
-        if (!file.exists()) {
+        if (!zipFile.exists()) {
             System.out.println("File not found: " + zipFilePath);
             System.exit(1);
         }
 
-        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(file))) {
+        try (
+            BufferedInputStream bis = new BufferedInputStream(new FileInputStream(zipFile));
+            ZipInputStream zis = new ZipInputStream(bis)
+        ) {
+            int count;
+            int bufferSize = 8192;
+            byte[] buffer = new byte[bufferSize];
+            long lengthTotal = zipFile.length();
+            long lengthRead = bufferSize;
+            int percent = 0;
+
             ZipEntry entry;
             while ((entry = zis.getNextEntry()) != null) {
-                System.out.println("Extracting: " + entry.getName());
-                zis.closeEntry();
+                if (entry.getName().contains("\\")) {
+                    System.out.println("Windows path is not supported: " + entry.getName());
+                    System.exit(1);
+                }
+                File file = new File(targetDirectory, entry.getName());
+                String canonicalPath = file.getCanonicalPath();
+                String canonicalDir = targetDirectory.getCanonicalPath();
+                File dir = entry.isDirectory() ? file : file.getParentFile();
+
+                if (!canonicalPath.startsWith(canonicalDir)) {
+                    System.out.println("SecurityException, Failed to ensure directory is the start path: " +
+                            canonicalDir + " of " + canonicalPath);
+                    System.exit(1);
+                }
+
+                if (!dir.isDirectory() && !dir.mkdirs()) {
+                    System.out.println("Failed to ensure directory: " + dir.getAbsolutePath());
+                    System.exit(1);
+                }
+
+                if (entry.isDirectory()) {
+                    continue;
+                }
+
+                try (FileOutputStream outputStream = new FileOutputStream(file)) {
+                    while ((count = zis.read(buffer)) != -1) {
+                        outputStream.write(buffer, 0, count);
+                    }
+                }
+
+                int newPercent = (int) ((lengthRead / (float) lengthTotal) * 100);
+                if (lengthTotal > 1 && newPercent != percent) {
+                    percent = newPercent;
+                }
+
+                lengthRead += entry.getCompressedSize();
             }
             System.out.println("ZIP file is valid: " + zipFilePath);
         } catch (IOException e) {

package/test/VerifyZip.swift

@@ -0,0 +1,54 @@
+import Foundation
+import SSZipArchive
+
+func verifyZipFile(zipFilePath: String) -> Bool {
+    let destUnZip = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("extracted")
+    
+    var unzipError: NSError?
+    let success = SSZipArchive.unzipFile(atPath: zipFilePath,
+                                         toDestination: destUnZip.path,
+                                         preserveAttributes: true,
+                                         overwrite: true,
+                                         nestedZipLevel: 1,
+                                         password: nil,
+                                         error: &unzipError,
+                                         delegate: nil,
+                                         progressHandler: { (entry, _, _, _) in
+                                            if entry.contains("\\") {
+                                                print("Windows path is not supported: \(entry)")
+                                                exit(1)
+                                            }
+                                            
+                                            let fileURL = destUnZip.appendingPathComponent(entry)
+                                            let canonicalPath = fileURL.path
+                                            let canonicalDir = destUnZip.path
+                                            
+                                            if !canonicalPath.hasPrefix(canonicalDir) {
+                                                print("SecurityException, Failed to ensure directory is the start path: \(canonicalDir) of \(canonicalPath)")
+                                                exit(1)
+                                            }
+                                         },
+                                         completionHandler: nil)
+    
+    if !success || unzipError != nil {
+        print("Failed to unzip file: \(zipFilePath)")
+        print("Error: \(unzipError?.localizedDescription ?? "")")
+        return false
+    }
+    
+    print("ZIP file is valid: \(zipFilePath)")
+    return true
+}
+
+let zipFilePaths = CommandLine.arguments.dropFirst()
+
+if zipFilePaths.isEmpty {
+    print("Usage: swift run VerifyZip <zip-file1> <zip-file2> ...")
+    exit(1)
+}
+
+for zipFilePath in zipFilePaths {
+    if !verifyZipFile(zipFilePath: zipFilePath) {
+        exit(1)
+    }
+}