@capgo/cli 4.10.2 → 4.10.6-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.10.2",
+  "version": "4.10.6-beta.1",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",
@@ -40,51 +40,56 @@
     "pack": "pkg",
     "types": "npx --yes supabase gen types typescript --project-id=xvwzpoazmxkqosrdewyv > src/types/supabase.types.ts",
     "test_rls": "ts-node ./test/test_headers_rls.ts",
-    "lint": "eslint \"src/**/*.ts\" --fix"
+    "lint": "eslint \"src/**/*.ts\" --fix",
+    "check-posix-paths": "node test/check-posix-paths.js"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.574.0",
-    "@capacitor/cli": "6.0.0",
+    "@aws-sdk/client-s3": "^3.600.0",
+    "@capacitor/cli": "6.1.0",
     "@capgo/find-package-manager": "^0.0.17",
     "@clack/prompts": "^0.7.0",
     "@manypkg/find-root": "^2.2.1",
-    "@supabase/supabase-js": "^2.43.1",
+    "@supabase/supabase-js": "^2.43.5",
     "@tomasklaen/checksum": "^1.1.0",
     "@trufflesuite/spinnies": "^0.1.1",
-    "adm-zip": "^0.5.12",
+    "adm-zip": "^0.5.14",
     "ci-info": "^4.0.0",
-    "commander": "12.0.0",
-    "console-table-printer": "^2.12.0",
+    "commander": "12.1.0",
+    "console-table-printer": "^2.12.1",
     "get-latest-version": "^5.1.0",
-    "ky": "^1.2.4",
+    "is-wsl": "^3.1.0",
+    "jszip": "^3.10.1",
+    "ky": "^1.3.0",
     "logsnag": "1.0.0",
     "mime": "^4.0.3",
     "node-dir": "^0.1.17",
     "open": "^10.1.0",
     "prettyjson": "^1.2.5",
     "prompt-sync": "^4.2.0",
-    "semver": "^7.6.2"
+    "semver": "^7.6.2",
+    "tmp": "^0.2.3"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.17.0",
+    "@antfu/eslint-config": "^2.21.1",
     "@types/adm-zip": "0.5.5",
     "@types/mime": "^4.0.0",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.14.7",
     "@types/node-dir": "^0.0.37",
     "@types/npmcli__ci-detect": "^2.0.3",
     "@types/prettyjson": "^0.0.33",
     "@types/prompt-sync": "^4.2.3",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
-    "esbuild": "^0.21.2",
-    "eslint": "9.1.1",
+    "@types/tmp": "^0.2.6",
+    "@typescript-eslint/eslint-plugin": "^7.13.0",
+    "@typescript-eslint/parser": "^7.13.1",
+    "esbuild": "^0.21.5",
+    "eslint": "9.5.0",
     "git-format-staged": "3.1.1",
     "husky": "^9.0.11",
     "pkg": "5.8.1",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "4.2.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   }
 }

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']) {
@@ -74,7 +80,24 @@ interface version {
   id: string
   name: string
 }
-export function displayChannels(data: (Database['public']['Tables']['channels']['Row'] & { version?: version, secondVersion?: version })[]) {
+interface Channel {
+  id: number
+  name: string
+  public: boolean
+  ios: boolean
+  android: boolean
+  disableAutoUpdate: string
+  disableAutoUpdateUnderNative: boolean
+  allow_device_self_set: boolean
+  enable_progressive_deploy: boolean
+  secondaryVersionPercentage: number
+  secondVersion?: version
+  enableAbTesting: boolean
+  allow_emulator: boolean
+  allow_dev: boolean
+  version?: version
+}
+export function displayChannels(data: Channel[]) {
   const t = new Table({
     title: 'Channels',
     charLength: { '❌': 2, '✅': 2 },
@@ -86,8 +109,8 @@ export function displayChannels(data: (Database['public']['Tables']['channels'][
       'Name': row.name,
       ...(row.version ? { Version: row.version.name } : undefined),
       'Public': row.public ? '✅' : '❌',
-      'iOS': row.ios ? '❌' : '✅',
-      'Android': row.android ? '❌' : '✅',
+      'iOS': row.ios ? '✅' : '❌',
+      'Android': row.android ? '✅' : '❌',
       '⬆️ limit': row.disableAutoUpdate,
       '⬇️ under native': row.disableAutoUpdateUnderNative ? '❌' : '✅',
       'Self assign': row.allow_device_self_set ? '✅' : '❌',
@@ -136,5 +159,5 @@ export async function getActiveChannels(supabase: SupabaseClient<Database>, appi
     p.log.error(`App ${appid} not found in database`)
     program.error('')
   }
-  return data
+  return data as any as Channel[]
 }

package/src/api/versions.ts

@@ -24,7 +24,7 @@ export async function deleteAppVersion(supabase: SupabaseClient<Database>, appid
   }
 }
 
-export async function deleteSpecificVersion(supabase: SupabaseClient<Database>, appid: string, _userId: string, bundle: string) {
+export async function deleteSpecificVersion(supabase: SupabaseClient<Database>, appid: string, bundle: string) {
   const versionData = await getVersionData(supabase, appid, bundle)
   await checkVersionNotUsedInChannel(supabase, appid, versionData)
   await checkVersionNotUsedInDeviceOverride(supabase, appid, versionData)
@@ -55,12 +55,11 @@ export function displayBundles(data: (Database['public']['Tables']['app_versions
   p.log.success(t.render())
 }
 
-export async function getActiveAppVersions(supabase: SupabaseClient<Database>, appid: string, _userId: string) {
+export async function getActiveAppVersions(supabase: SupabaseClient<Database>, appid: string) {
   const { data, error: vError } = await supabase
     .from('app_versions')
     .select()
     .eq('app_id', appid)
-    // .eq('user_id', userId)
     .eq('deleted', false)
     .order('created_at', { ascending: false })
 

package/src/app/add.ts

@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto'
 import { existsSync, readFileSync } from 'node:fs'
 import process from 'node:process'
 import mime from 'mime'
@@ -49,7 +48,7 @@ export async function addAppInternal(appId: string, options: Options, organizati
 
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  await verifyUser(supabase, options.apikey, ['write', 'all'])
 
   // Check we have app access to this appId
   const appExist = await checkAppExists(supabase, appId)
@@ -95,23 +94,24 @@ export async function addAppInternal(appId: string, options: Options, organizati
     p.log.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`)
   }
 
-  const fileName = `icon_${randomUUID()}`
+  const fileName = `icon`
   let signedURL = 'https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png'
 
   // upload image if available
   if (iconBuff && iconType) {
     const { error } = await supabase.storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .upload(fileName, iconBuff, {
         contentType: iconType,
       })
     if (error) {
+      console.error(error)
       p.log.error(`Could not add app ${formatError(error)}`)
       program.error('')
     }
     const { data: signedURLData } = await supabase
       .storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .getPublicUrl(fileName)
     signedURL = signedURLData?.publicUrl || signedURL
   }

package/src/app/debug.ts

@@ -1,6 +1,6 @@
 import process from 'node:process'
+import ky from 'ky'
 import * as p from '@clack/prompts'
-import type { SupabaseClient } from '@supabase/supabase-js'
 import { program } from 'commander'
 import type LogSnag from 'logsnag'
 import type { Database } from '../types/supabase.types'
@@ -46,18 +46,36 @@ interface QueryStats {
   devicesId?: string[]
   search?: string
   order?: Order[]
-  rangeStart?: number
-  rangeEnd?: number
-  after?: string
+  rangeStart?: string
+  rangeEnd?: string
+  limit?: number
 }
-
-export async function getStats(supabase: SupabaseClient<Database>, query: QueryStats): Promise<Database['public']['Tables']['stats']['Row'] | null> {
+interface LogData {
+  app_id: string
+  device_id: string
+  action: Database['public']['Enums']['stats_action']
+  version_id: number
+  version?: number
+  created_at: string
+}
+export async function getStats(apikey: string, query: QueryStats, after: string | null): Promise<LogData | null> {
   try {
-    const pathStats = 'private/stats'
-    const res = await supabase.functions.invoke(pathStats, { body: JSON.stringify(query) })
-    const listData = res.data.data as Database['public']['Tables']['stats']['Row'][]
-    if (listData?.length > 0)
-      return listData[0]
+    const defaultApiHostPreprod = 'https://api-preprod.capgo.app'
+    const dataD = await ky
+      .post(`${defaultApiHostPreprod}/private/stats`, {
+        headers: {
+          'Content-Type': 'application/json',
+          'capgkey': apikey,
+        },
+        body: JSON.stringify(query),
+      })
+      .then(res => res.json<LogData[]>())
+      .catch((err) => {
+        console.error('Cannot get devices', err)
+        return [] as LogData[]
+      })
+    if (dataD?.length > 0 && (after === null || after !== dataD[0].created_at))
+      return dataD[0]
   }
   catch (error) {
     p.log.error(`Cannot get stats ${formatError(error)}`)
@@ -65,9 +83,8 @@ export async function getStats(supabase: SupabaseClient<Database>, query: QueryS
   return null
 }
 
-export async function waitLog(channel: string, supabase: SupabaseClient<Database>, appId: string, snag: LogSnag, orgId: string, deviceId?: string) {
+export async function waitLog(channel: string, apikey: string, appId: string, snag: LogSnag, orgId: string, deviceId?: string) {
   let loop = true
-  let now = new Date().toISOString()
   const appIdUrl = convertAppName(appId)
   const config = await getLocalConfig()
   const baseUrl = `${config.hostWeb}/app/p/${appIdUrl}`
@@ -79,14 +96,14 @@ export async function waitLog(channel: string, supabase: SupabaseClient<Database
       key: 'created_at',
       sortable: 'desc',
     }],
-    rangeStart: 0,
-    rangeEnd: 1,
-    after: now,
+    limit: 1,
+    rangeStart: new Date().toISOString(),
   }
+  let after: string | null = null
   while (loop) {
-    const data = await getStats(supabase, query)
-    //   console.log('data', data)
+    const data = await getStats(apikey, query, after)
     if (data) {
+      after = data.created_at
       p.log.info(`Log from Device: ${data.device_id}`)
       if (data.action === 'get') {
         p.log.info('Update Sent your your device, wait until event download complete')
@@ -122,7 +139,7 @@ export async function waitLog(channel: string, supabase: SupabaseClient<Database
         p.log.error('Your bundle is missing, please check how you build your app ')
       }
       else if (data.action === 'noNew') {
-        p.log.error(`Your version in ${data.platform} is the same as your version uploaded, change it to see the update`)
+        p.log.error(`Your version in ${data.device_id} is the same as your version uploaded, change it to see the update`)
       }
       else if (data.action === 'disablePlatformIos') {
         p.log.error(`iOS is disabled  in the default channel and your device is an iOS device ${baseUrl}`)
@@ -166,10 +183,8 @@ export async function waitLog(channel: string, supabase: SupabaseClient<Database
       else {
         p.log.error(`Log from Capgo ${data.action}`)
       }
-      now = new Date().toISOString()
-      query.after = now
     }
-    await wait(1000)
+    await wait(5000)
   }
   return Promise.resolve()
 }
@@ -208,8 +223,8 @@ export async function debugApp(appId: string, options: OptionsBaseDebug) {
   await cancelCommand('debug', doRun, userId, snag)
   if (doRun) {
     p.log.info(`Wait logs sent to Capgo from ${appId} device, Put the app in background and open it again.`)
-    p.log.info('Waiting...')
-    await waitLog('debug', supabase, appId, snag, orgId, deviceId)
+    p.log.info('Waiting... (there is a usual delay of 15 seconds until the backend process the logs)')
+    await waitLog('debug', options.apikey, appId, snag, orgId, deviceId)
     p.outro(`Done ✅`)
   }
   else {

package/src/app/delete.ts

@@ -3,7 +3,7 @@ import { program } from 'commander'
 import * as p from '@clack/prompts'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import type { OptionsBase } from '../utils'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 export async function deleteApp(appId: string, options: OptionsBase) {
   p.intro(`Deleting`)
@@ -27,11 +27,11 @@ export async function deleteApp(appId: string, options: OptionsBase) {
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.super_admin)
 
   const { data: appOwnerRaw, error: appOwnerError } = await supabase.from('apps')
-    .select(`owner_org ( created_by )`)
+    .select(`owner_org ( created_by, id )`)
     .eq('app_id', appId)
     .single()
 
-  const appOwner = appOwnerRaw as { owner_org: { created_by: string } } | null
+  const appOwner = appOwnerRaw as { owner_org: { created_by: string, id: string } } | null
 
   if (!appOwnerError && (appOwner?.owner_org.created_by ?? '') !== userId) {
     // We are dealing with a member user that is not the owner
@@ -66,11 +66,14 @@ export async function deleteApp(appId: string, options: OptionsBase) {
 
   const { error } = await supabase
     .storage
-    .from(`images/${userId}`)
-    .remove([appId])
-  if (error)
+    .from(`images`)
+    .remove([`org/${appOwner?.owner_org.id}/${appId}/icon`])
+  if (error) {
+    console.error(error, `images/org/${appOwner?.owner_org.id}/${appId}`)
     p.log.error('Could not delete app logo')
+  }
 
+  // TODO: make the version delete in R2 too
   const { error: delError } = await supabase
     .storage
     .from(`apps/${appId}/${userId}`)
@@ -84,17 +87,18 @@ export async function deleteApp(appId: string, options: OptionsBase) {
     .from('apps')
     .delete()
     .eq('app_id', appId)
-    .eq('user_id', userId)
+    // .eq('user_id', userId)
 
   if (dbError) {
     p.log.error('Could not delete app')
     program.error('')
   }
+  const orgId = await getOrganizationId(supabase, appId)
   await snag.track({
     channel: 'app',
     event: 'App Deleted',
     icon: '🗑️',
-    user_id: userId,
+    user_id: orgId,
     tags: {
       'app-id': appId,
     },

package/src/app/info.ts

@@ -39,7 +39,10 @@ async function getInstalledDependencies() {
     '@capgo/cli': pack.version,
   }
   for (const dependency in dependencies) {
-    if (Object.prototype.hasOwnProperty.call(dependencies, dependency) && dependency.startsWith('@capgo/')) {
+    if (Object.prototype.hasOwnProperty.call(dependencies, dependency)
+      && dependency.startsWith('@capgo/')
+      && dependency.startsWith('@capawesome/')
+      && dependency.startsWith('capacitor')) {
       // remove ^ or ~ from version
       const version = dependencies[dependency].replace('^', '').replace('~', '')
       installedDependencies[dependency] = version

package/src/app/set.ts

@@ -6,7 +6,7 @@ import { program } from 'commander'
 import * as p from '@clack/prompts'
 import type { Options } from '../api/app'
 import { checkAppExistsAndHasPermissionOrgErr, newIconPath } from '../api/app'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganization, verifyUser } from '../utils'
 
 export async function setApp(appId: string, options: Options) {
   p.intro(`Set app`)
@@ -23,6 +23,8 @@ export async function setApp(appId: string, options: Options) {
     program.error(``)
   }
   const supabase = await createSupabaseClient(options.apikey)
+  const organization = await getOrganization(supabase, ['admin', 'super_admin'])
+  const organizationUid = organization.gid
 
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
@@ -61,7 +63,7 @@ export async function setApp(appId: string, options: Options) {
   }
   if (iconBuff && iconType) {
     const { error } = await supabase.storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .upload(fileName, iconBuff, {
         contentType: iconType,
       })
@@ -71,7 +73,7 @@ export async function setApp(appId: string, options: Options) {
     }
     const { data: signedURLData } = await supabase
       .storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .getPublicUrl(fileName)
     signedURL = signedURLData?.publicUrl || signedURL
   }

package/src/bundle/cleanup.ts

@@ -20,11 +20,11 @@ interface Options extends OptionsBase {
 
 const prompt = promptSync()
 
-async function removeVersions(toRemove: Database['public']['Tables']['app_versions']['Row'][], supabase: SupabaseClient<Database>, appid: string, userId: string) {
+async function removeVersions(toRemove: Database['public']['Tables']['app_versions']['Row'][], supabase: SupabaseClient<Database>, appid: string) {
   // call deleteSpecificVersion one by one from toRemove sync
   for await (const row of toRemove) {
     p.log.warn(`Removing ${row.name} created on ${(getHumanDate(row.created_at))}`)
-    await deleteSpecificVersion(supabase, appid, userId, row.name)
+    await deleteSpecificVersion(supabase, appid, row.name)
   }
 }
 
@@ -57,14 +57,14 @@ export async function cleanupBundle(appid: string, options: Options) {
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  await verifyUser(supabase, options.apikey, ['write', 'all'])
 
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.write)
   p.log.info(`Querying all available versions in Capgo`)
 
   // Get all active app versions we might possibly be able to cleanup
-  let allVersions: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[] = await getActiveAppVersions(supabase, appid, userId)
+  let allVersions: (Database['public']['Tables']['app_versions']['Row'] & { keep?: string })[] = await getActiveAppVersions(supabase, appid)
 
   const versionInUse = await getChannelsVersion(supabase, appid)
 
@@ -121,7 +121,7 @@ export async function cleanupBundle(appid: string, options: Options) {
 
   // Yes, lets clean it up
   p.log.success('You have confirmed removal, removing versions now')
-  await removeVersions(toRemove, supabase, appid, userId)
+  await removeVersions(toRemove, supabase, appid)
   p.outro(`Done ✅`)
   process.exit()
 }

package/src/bundle/delete.ts

@@ -26,7 +26,7 @@ export async function deleteBundle(bundleId: string, appId: string, options: Opt
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.write)
 
@@ -46,7 +46,7 @@ export async function deleteBundle(bundleId: string, appId: string, options: Opt
 
   p.log.info(`Deleting bundle ${appId}@${bundleId} from Capgo`)
 
-  await deleteSpecificVersion(supabase, appId, userId, bundleId)
+  await deleteSpecificVersion(supabase, appId, bundleId)
   p.log.success(`Bundle ${appId}@${bundleId} deleted in Capgo`)
   p.outro(`Done`)
   process.exit()

package/src/bundle/list.ts

@@ -25,7 +25,7 @@ export async function listBundle(appId: string, options: OptionsBase) {
 
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload'])
+  await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload'])
 
   p.log.info(`Querying available versions of: ${appId} in Capgo`)
 
@@ -33,7 +33,7 @@ export async function listBundle(appId: string, options: OptionsBase) {
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.read)
 
   // Get all active app versions we might possibly be able to cleanup
-  const allVersions = await getActiveAppVersions(supabase, appId, userId)
+  const allVersions = await getActiveAppVersions(supabase, appId)
 
   p.log.info(`Active versions in Capgo: ${allVersions?.length}`)
 

package/src/bundle/upload.ts

@@ -3,12 +3,11 @@ import { existsSync, readFileSync } from 'node:fs'
 import process from 'node:process'
 import type { Buffer } from 'node:buffer'
 import { performance } from 'node:perf_hooks'
-import AdmZip from 'adm-zip'
 import { program } from 'commander'
 import * as p from '@clack/prompts'
 import { checksum as getChecksum } from '@tomasklaen/checksum'
 import ciDetect from 'ci-info'
-import ky from 'ky'
+import ky, { HTTPError } from 'ky'
 import {
   PutObjectCommand,
   S3Client,
@@ -43,6 +42,7 @@ import {
   uploadUrl,
   useLogSnag,
   verifyUser,
+  zipFile,
 } from '../utils'
 import { checkIndexPosition, searchInDirectory } from './check'
 
@@ -100,8 +100,6 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   channel = channel || 'dev'
 
   const config = await getConfig()
-  const localS3: boolean = (config?.app?.extConfig?.plugins && config?.app?.extConfig?.plugins?.CapacitorUpdater
-    && config?.app?.extConfig?.plugins?.CapacitorUpdater?.localS3) === true
 
   const checkNotifyAppReady = options.codeCheck
   appid = appid || config?.app?.appId
@@ -258,9 +256,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   let checksum = ''
   let zipped: Buffer | null = null
   if (!external && useS3 === false) {
-    const zip = new AdmZip()
-    zip.addLocalFolder(path)
-    zipped = zip.toBuffer()
+    zipped = await zipFile(path)
     const s = p.spinner()
     s.start(`Calculating checksum`)
     checksum = await getChecksum(zipped, 'crc32')
@@ -289,7 +285,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
         channel: 'app',
         event: 'App encryption',
         icon: '🔑',
-        user_id: userId,
+        user_id: orgId,
         tags: {
           'app-id': appid,
         },
@@ -319,7 +315,7 @@ It will be also visible in your dashboard\n`)
         channel: 'app-error',
         event: 'App Too Large',
         icon: '🚛',
-        user_id: userId,
+        user_id: orgId,
         tags: {
           'app-id': appid,
         },
@@ -333,9 +329,7 @@ It will be also visible in your dashboard\n`)
   }
   else {
     if (useS3) {
-      const zip = new AdmZip()
-      zip.addLocalFolder(path)
-      zipped = zip.toBuffer()
+      zipped = await zipFile(path)
       const s = p.spinner()
       s.start(`Calculating checksum`)
       checksum = await getChecksum(zipped, 'crc32')
@@ -345,7 +339,7 @@ It will be also visible in your dashboard\n`)
       channel: 'app',
       event: 'App external',
       icon: '📤',
-      user_id: userId,
+      user_id: orgId,
       tags: {
         'app-id': appid,
       },
@@ -387,7 +381,8 @@ It will be also visible in your dashboard\n`)
 
     try {
       if (options.multipart !== undefined && options.multipart) {
-        await uploadMultipart(supabase, appid, bundle, zipped)
+        p.log.info(`Uploading bundle as multipart`)
+        await uploadMultipart(supabase, appid, bundle, zipped, orgId)
       }
       else {
         const url = await uploadUrl(supabase, appid, bundle)
@@ -395,18 +390,10 @@ It will be also visible in your dashboard\n`)
           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),
         })
       }
     }
@@ -414,7 +401,11 @@ 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)}`)
+      }
       // call delete version on path /delete_failed_version to delete the version
       await deletedFailedVersion(supabase, appid, bundle)
       program.error('')
@@ -496,7 +487,7 @@ It will be also visible in your dashboard\n`)
     channel: 'app',
     event: 'App Uploaded',
     icon: '⏫',
-    user_id: userId,
+    user_id: orgId,
     tags: {
       'app-id': appid,
     },