@capgo/cli 4.10.65-beta.1 → 4.11.1

package/package.json

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

package/src/init.ts

@@ -2,7 +2,6 @@ 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,5 +1,5 @@
 import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
-import { homedir } from 'node:os'
+import { homedir, release as osRelease } from 'node:os'
 import { join, resolve, sep } from 'node:path'
 import process from 'node:process'
 import type { Buffer } from 'node:buffer'
@@ -15,8 +15,7 @@ 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 JSZip from 'jszip'
 import type { Database } from './types/supabase.types'
 
@@ -520,6 +519,21 @@ async function prepareMultipart(supabase: SupabaseClient<Database>, appId: strin
 }
 
 export async function zipFile(filePath: string): Promise<Buffer> {
+  if (osRelease().toLowerCase().includes('microsoft')) {
+    return zipFileWindows(filePath)
+  }
+  else {
+    return zipFileUnix(filePath)
+  }
+}
+
+export function zipFileUnix(filePath: string) {
+  const zip = new AdmZip()
+  zip.addLocalFolder(filePath)
+  return zip.toBuffer()
+}
+
+export async function zipFileWindows(filePath: string): Promise<Buffer> {
   const zip = new JSZip()
 
   // Helper function to recursively add files and folders to the ZIP archive
@@ -544,21 +558,10 @@ export async function zipFile(filePath: string): Promise<Buffer> {
   await addToZip(filePath, '')
 
   // Generate the ZIP file as a Buffer
-  const zipBuffer = await zip.generateAsync({ type: 'nodebuffer', platform: 'UNIX' })
+  const zipBuffer = await zip.generateAsync({ type: 'nodebuffer', platform: 'UNIX', compression: 'DEFLATE' })
   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/test_zip_swift/Package.resolved

@@ -0,0 +1,24 @@
+{
+  "originHash" : "be28ad70f15d01b567aeb05f85c074fc7d437a0ade8a8ceab7a6149b8f5b3593",
+  "pins" : [
+    {
+      "identity" : "swift-argument-parser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-argument-parser",
+      "state" : {
+        "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
+        "version" : "1.4.0"
+      }
+    },
+    {
+      "identity" : "ziparchive",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ZipArchive/ZipArchive.git",
+      "state" : {
+        "revision" : "79d4dc9729096c6ad83dd3cee2b9f354d1b4ab7b",
+        "version" : "2.5.5"
+      }
+    }
+  ],
+  "version" : 3
+}

package/test/test_zip_swift/Package.swift

@@ -0,0 +1,29 @@
+// swift-tools-version: 5.10
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "MyCLI",
+    platforms: [
+        .macOS(.v11)
+    ], dependencies: [
+        .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "1.4.0")),
+        .package(url: "https://github.com/ZipArchive/ZipArchive.git", .upToNextMajor(from: "2.5.5"))
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .executableTarget(
+            name: "MyCLI", 
+            dependencies: [
+                .product(name: "ZipArchive", package: "ZipArchive"),
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+            ],
+            path: "Sources",
+            swiftSettings: [
+                .unsafeFlags(["-parse-as-library"])
+            ]
+        ),
+    ]
+)

package/test/test_zip_swift/Sources/main.swift

@@ -0,0 +1,80 @@
+// The Swift Programming Language
+// https://docs.swift.org/swift-book
+
+import ArgumentParser
+import Foundation
+import ZipArchive
+import Darwin
+
+extension URL {
+    var isDirectory: Bool {
+        (try? resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == true
+    }
+    var exist: Bool {
+        return FileManager().fileExists(atPath: self.path)
+    }
+}
+
+
+func verifyZipFile(zipFilePath: String) {
+    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 ?? "")")
+        exit(1)
+    }
+
+    print("ZIP file is valid: \(zipFilePath)")
+}
+
+@main
+struct CapgoCliTest: ParsableCommand {
+    @Option(parsing: .upToNextOption, help: "Specify the files to test")
+  public var zipFiles: [String]
+
+  public func run() throws {
+    print("Hello capgo test", zipFiles)
+      
+      for file in zipFiles {
+          guard let fileUrl =  URL(string: file) else {
+              print("Cannot convert \"\(file)\" into a file")
+              Darwin.exit(1)
+          }
+          
+          if (!fileUrl.exist) {
+              print("File \"\(fileUrl)\" does not exist")
+              Darwin.exit(1)
+          }
+          
+        print("Testing file \(file)")
+        verifyZipFile(zipFilePath: file)
+      }
+  }
+}

package/test/VerifyZip.swift

@@ -1,54 +0,0 @@
-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)
-    }
-}