@capgo/cli 4.10.20 → 4.10.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.10.20",
+  "version": "4.10.22",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",
@@ -56,6 +56,7 @@
     "commander": "12.1.0",
     "console-table-printer": "^2.12.0",
     "get-latest-version": "^5.1.0",
+    "is-wsl": "^3.1.0",
     "ky": "^1.3.0",
     "logsnag": "1.0.0",
     "mime": "^4.0.3",

package/src/bundle/upload.ts

@@ -3,7 +3,6 @@ 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'
@@ -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 = zipFile(path)
     const s = p.spinner()
     s.start(`Calculating checksum`)
     checksum = await getChecksum(zipped, 'crc32')
@@ -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 = zipFile(path)
       const s = p.spinner()
       s.start(`Calculating checksum`)
       checksum = await getChecksum(zipped, 'crc32')
@@ -400,12 +394,6 @@ It will be also visible in your dashboard\n`)
           timeout: options.timeout || UPLOAD_TIMEOUT,
           retry: 5,
           body: zipped,
-          headers: (!localS3
-            ? {
-                'Content-Type': 'application/octet-stream',
-                'Cache-Control': 'public, max-age=456789, immutable',
-              }
-            : undefined),
         })
       }
     }

package/src/bundle/zip.ts

@@ -1,7 +1,6 @@
 import { randomUUID } from 'node:crypto'
 import { writeFileSync } from 'node:fs'
 import process from 'node:process'
-import AdmZip from 'adm-zip'
 import { program } from 'commander'
 import * as p from '@clack/prompts'
 import { checksum as getChecksum } from '@tomasklaen/checksum'
@@ -14,6 +13,7 @@ import {
   getConfig,
   regexSemver,
   useLogSnag,
+  zipFile,
 } from '../utils'
 import { checkIndexPosition, searchInDirectory } from './check'
 
@@ -78,9 +78,7 @@ export async function zipBundle(appId: string, options: Options) {
       program.error('')
     }
   }
-  const zip = new AdmZip()
-  zip.addLocalFolder(path)
-  const zipped = zip.toBuffer()
+  const zipped = zipFile(path)
   if (!json)
     p.log.info(`Zipped ${zipped.byteLength} bytes`)
   const s = p.spinner()

package/src/index.ts

@@ -1,6 +1,6 @@
 import { program } from 'commander'
-import { getUserId } from 'user/account'
 import pack from '../package.json'
+import { getUserId } from './user/account'
 import { zipBundle } from './bundle/zip'
 import { initApp } from './init'
 import { listBundle } from './bundle/list'

package/src/utils.ts

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync, readdirSync } from 'node:fs'
-import { homedir } from 'node:os'
+import os, { homedir } from 'node:os'
 import { resolve } from 'node:path'
 import process from 'node:process'
 import type { Buffer } from 'node:buffer'
@@ -15,6 +15,8 @@ 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 type { Database } from './types/supabase.types'
 
 export const baseKey = '.capgo_key'
@@ -516,6 +518,17 @@ 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)
+  return zip.toBuffer()
+}
+
 async function finishMultipartDownload(key: string, uploadId: string, url: string, parts: any[]) {
   const metadata = {
     action: 'mpu-complete',