@capgo/cli 4.10.22 → 4.10.24-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.10.22",
+  "version": "4.10.24-beta.1",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",

package/src/api/channels.ts

@@ -51,7 +51,13 @@ export function findUnknownVersion(supabase: SupabaseClient<Database>, appId: st
     .eq('app_id', appId)
     .eq('name', 'unknown')
     .throwOnError()
-    .single().then(({ data }) => data)
+    .single().then(({ data, error }) => {
+      if (error) {
+        p.log.error(`Cannot call findUnknownVersion as it returned an error.\n${formatError(error)}`)
+        program.error('')
+      }
+      return data
+    })
 }
 
 export function createChannel(supabase: SupabaseClient<Database>, update: Database['public']['Tables']['channels']['Insert']) {

package/src/bundle/upload.ts

@@ -401,7 +401,7 @@ It will be also visible in your dashboard\n`)
       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)}`)
+      p.log.error(`Cannot upload bundle ( try again with --multipart option) ${formatError(errorUpload)}`)
       if (errorUpload instanceof HTTPError) {
         const body = await errorUpload.response.text()
         p.log.error(`Response: ${formatError(body)}`)

package/src/channel/add.ts

@@ -4,7 +4,7 @@ import * as p from '@clack/prompts'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { createChannel, findUnknownVersion } from '../api/channels'
 import type { OptionsBase } from '../utils'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 interface Options extends OptionsBase {
   default?: boolean
@@ -39,12 +39,18 @@ export async function addChannel(channelId: string, appId: string, options: Opti
       p.log.error(`Cannot find default version for channel creation, please contact Capgo support 🤨`)
       program.error('')
     }
-    await createChannel(supabase, {
+    const res = await createChannel(supabase, {
       name: channelId,
       app_id: appId,
       version: data.id,
       owner_org: orgId,
     })
+
+    if (res.error) {
+      p.log.error(`Cannot create Channel 🙀\n${formatError(res.error)}`)
+      program.error('')
+    }
+
     p.log.success(`Channel created ✅`)
     await snag.track({
       channel: 'channel',

package/src/init.ts

@@ -51,7 +51,7 @@ async function step2(organization: Organization, snag: LogSnag, appId: string, o
       s.stop(`App add Done ✅`)
   }
   else {
-    p.log.info(`Run yourself "${pm.runner} @capgo/cli@latest app add ${appId}"`)
+    p.log.info(`If you change your mind, run it for yourself with: "${pm.runner} @capgo/cli@latest app add ${appId}"`)
   }
   await markStep(organization.gid, snag, 2)
 }
@@ -74,7 +74,7 @@ async function step3(orgId: string, snag: LogSnag, apikey: string, appId: string
       s.stop(`Channel add Done ✅`)
   }
   else {
-    p.log.info(`Run yourself "${pm.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`)
+    p.log.info(`If you change your mind, run it for yourself with: "${pm.runner} @capgo/cli@latest channel add ${defaultChannel} ${appId} --default"`)
   }
   await markStep(orgId, snag, 3)
 }
@@ -126,7 +126,7 @@ async function step4(orgId: string, snag: LogSnag, apikey: string, appId: string
     }
   }
   else {
-    p.log.info(`Run yourself "${pm.installCommand} @capgo/capacitor-updater@latest"`)
+    p.log.info(`If you change your mind, run it for yourself with: "${pm.installCommand} @capgo/capacitor-updater@latest"`)
   }
   await markStep(orgId, snag, 4)
 }
@@ -277,7 +277,7 @@ async function step9(orgId: string, snag: LogSnag) {
     s.stop(`Started Done ✅`)
   }
   else {
-    p.log.info(`Run yourself with command: ${pm.runner} cap run <ios|android>`)
+    p.log.info(`If you change your mind, run it for yourself with: ${pm.runner} cap run <ios|android>`)
   }
   await markStep(orgId, snag, 9)
 }

package/src/key.ts

@@ -76,8 +76,8 @@ export async function createKey(options: Options, log = true) {
 
   // check if baseName already exist
   if (existsSync(baseKeyPub) && !options.force) {
+    p.log.error('Public Key already exists, use --force to overwrite')
     if (log) {
-      p.log.error('Public Key already exists, use --force to overwrite')
       program.error('')
     }
     else {
@@ -86,8 +86,8 @@ export async function createKey(options: Options, log = true) {
   }
   writeFileSync(baseKeyPub, publicKey)
   if (existsSync(baseKey) && !options.force) {
+    p.log.error('Private Key already exists, use --force to overwrite')
     if (log) {
-      p.log.error('Private Key already exists, use --force to overwrite')
       program.error('')
     }
     else {

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, relative, resolve, sep } from 'node:path'
 import process from 'node:process'
 import type { Buffer } from 'node:buffer'
 import { loadConfig } from '@capacitor/cli/dist/config'
@@ -16,7 +16,7 @@ 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 isWsl from 'is-wsl'
 import type { Database } from './types/supabase.types'
 
 export const baseKey = '.capgo_key'
@@ -519,15 +519,45 @@ 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('')
-  }
   const zip = new AdmZip()
-  zip.addLocalFolder(filePath)
+
+  // Helper function to recursively add files and folders to the ZIP archive
+  const addToZip = (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 = readFileSync(itemPath)
+        const relativePath = join(zipPath, item)
+        const posixPath = relativePath.split(sep).join('/')
+        zip.addFile(posixPath, fileContent)
+      }
+      else if (stats.isDirectory()) {
+        // Recursively add subdirectories and their contents to the ZIP archive
+        const subZipPath = join(zipPath, item)
+        addToZip(itemPath, subZipPath)
+      }
+    }
+  }
+
+  // Start adding files and folders to the ZIP archive
+  addToZip(filePath, '')
+
   return zip.toBuffer()
 }
+// 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 = {