@mcesystems/apple-kit 1.0.33 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcesystems/apple-kit",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "description": "iOS device management toolkit using libimobiledevice command-line tools",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/scripts/export-resources.mts

@@ -24,7 +24,10 @@ import {
 	existsSync,
 	mkdirSync,
 	readFileSync,
+	readdirSync,
 	readlinkSync,
+	rmSync,
+	unlinkSync,
 	writeFileSync,
 } from "node:fs";
 import path from "node:path";
@@ -67,6 +70,10 @@ const HOMEBREW_INTEL_PATH = "/usr/local";
 // MSYS2 paths on Windows
 const MSYS2_DEFAULT_PATH = "C:\\msys64";
 
+// Pre-built resources configuration
+const PREBUILT_RESOURCES_DIR = path.join(__dirname, "..", "prebuilt");
+const LIBIMOBILEDEVICE_VERSION = "1.0.0";
+
 // System library prefixes that should NOT be copied (they exist on all macOS)
 const SYSTEM_LIB_PREFIXES = ["/System/Library/", "/usr/lib/", "/Library/Apple/"];
 
@@ -298,7 +305,7 @@ async function codesignBinary(binaryPath: string): Promise<boolean> {
 async function verifyBinary(
 	binaryPath: string,
 	binDir: string
-): Promise<{ success: boolean; error?: string }> {
+): Promise<{ success: boolean; error?: string; }> {
 	const binaryName = path.basename(binaryPath);
 
 	// Check that otool shows no broken paths
@@ -337,7 +344,7 @@ async function verifyBinary(
 	if (!binaryName.endsWith(".dylib")) {
 		try {
 			// Use spawn with a timeout to test if the binary loads
-			const result = await new Promise<{ success: boolean; error?: string }>((resolve) => {
+			const result = await new Promise<{ success: boolean; error?: string; }>((resolve) => {
 				const child = spawn(binaryPath, ["--help"], {
 					timeout: 5000,
 					env: { ...process.env, DYLD_LIBRARY_PATH: binDir },
@@ -569,17 +576,117 @@ async function exportDarwinResources(targetDir: string, skipVerify: boolean): Pr
 // Windows Export
 // ============================================================================
 
+/**
+ * Get the path to the pre-built Windows resources archive
+ */
+function getPrebuiltWindowsArchivePath(): string {
+	return path.join(PREBUILT_RESOURCES_DIR, `libimobiledevice-windows-v${LIBIMOBILEDEVICE_VERSION}.tar.gz`);
+}
+
+/**
+ * Check if pre-built Windows resources exist
+ */
+function hasPrebuiltWindowsResources(): boolean {
+	const archivePath = getPrebuiltWindowsArchivePath();
+	return existsSync(archivePath);
+}
+
+/**
+ * Extract pre-built Windows resources to target directory
+ */
+async function extractPrebuiltWindowsResources(targetDir: string): Promise<void> {
+	const archivePath = getPrebuiltWindowsArchivePath();
+	const windowsBinDir = path.join(targetDir, "bin", "windows");
+
+	console.log(`Extracting pre-built resources from: ${path.basename(archivePath)}`);
+	mkdirSync(windowsBinDir, { recursive: true });
+
+	// Use tar command to extract (available on Windows 10+ and via MSYS2)
+	try {
+		await execAsync(`tar -xzf "${archivePath}" -C "${windowsBinDir}"`);
+		console.log(`✓ Extracted pre-built Windows resources to: ${windowsBinDir}`);
+	} catch (error) {
+		throw new Error(`Failed to extract pre-built resources: ${error}`);
+	}
+}
+
+/**
+ * Create a tar.gz archive of the built Windows resources
+ */
+async function createWindowsResourcesArchive(targetDir: string): Promise<void> {
+	const windowsBinDir = path.join(targetDir, "bin", "windows");
+	const archivePath = getPrebuiltWindowsArchivePath();
+
+	// Ensure prebuilt directory exists
+	mkdirSync(PREBUILT_RESOURCES_DIR, { recursive: true });
+
+	console.log(`\nCreating pre-built resources archive: ${path.basename(archivePath)}`);
+
+	// Get list of files in windows bin directory
+	const files = readdirSync(windowsBinDir);
+	if (files.length === 0) {
+		console.warn("Warning: No files to archive in Windows bin directory");
+		return;
+	}
+
+	// Use tar command to create archive
+	try {
+		await execAsync(`tar -czf "${archivePath}" -C "${windowsBinDir}" .`);
+		console.log(`✓ Created pre-built resources archive: ${archivePath}`);
+	} catch (error) {
+		console.warn(`Warning: Failed to create archive: ${error}`);
+	}
+}
+
+/**
+ * Clean up build artifacts (build script and limd-build folder)
+ */
+function cleanupWindowsBuildArtifacts(targetDir: string): void {
+	const scriptPath = path.join(targetDir, "build-windows.sh");
+	const buildDir = path.join(targetDir, "limd-build");
+
+	console.log("\nCleaning up build artifacts...");
+
+	// Remove build script
+	if (existsSync(scriptPath)) {
+		unlinkSync(scriptPath);
+		console.log("  ✓ Removed build-windows.sh");
+	}
+
+	// Remove limd-build directory
+	if (existsSync(buildDir)) {
+		rmSync(buildDir, { recursive: true, force: true });
+		console.log("  ✓ Removed limd-build directory");
+	}
+}
+
 async function exportWindowsResources(targetDir: string): Promise<void> {
 	console.log("\n=== Exporting Windows Resources ===\n");
 
 	// Check if we're on Windows
 	if (process.platform !== "win32") {
+		// On non-Windows, check for pre-built resources first
+		if (hasPrebuiltWindowsResources()) {
+			console.log("Found pre-built Windows resources, extracting...");
+			await extractPrebuiltWindowsResources(targetDir);
+			return;
+		}
+
 		console.log("Note: Windows resources can only be built on Windows.");
 		console.log("Generating build script for later use...\n");
 		generateWindowsBuildScript(targetDir);
 		return;
 	}
 
+	// On Windows, check for pre-built resources first
+	if (hasPrebuiltWindowsResources()) {
+		console.log("Found pre-built Windows resources, extracting...");
+		await extractPrebuiltWindowsResources(targetDir);
+		return;
+	}
+
+	console.log("No pre-built resources found, building from source...");
+
 	// Check for MSYS2
 	const msys2Path = process.env.MSYS2_PATH || MSYS2_DEFAULT_PATH;
 	if (!existsSync(msys2Path)) {
@@ -593,9 +700,68 @@ async function exportWindowsResources(targetDir: string): Promise<void> {
 	// Generate the build script
 	generateWindowsBuildScript(targetDir);
 
-	console.log("\nTo build Windows resources:");
-	console.log("1. Open MSYS2 MinGW 64-bit shell");
-	console.log(`2. Run: bash "${path.join(targetDir, "build-windows.sh")}"`);
+	// Run the build script through MSYS2's bash
+	const scriptPath = path.join(targetDir, "build-windows.sh");
+	await runMsys2Build(msys2Path, scriptPath);
+
+	// Clean up build artifacts
+	cleanupWindowsBuildArtifacts(targetDir);
+
+	// Create archive for future use
+	await createWindowsResourcesArchive(targetDir);
+}
+
+async function runMsys2Build(msys2Path: string, scriptPath: string): Promise<void> {
+	console.log("\nRunning Windows build through MSYS2...");
+	console.log("(This may take 10-30 minutes depending on your system)\n");
+
+	const envPath = path.join(msys2Path, "usr", "bin", "env.exe");
+	const bashPath = path.join(msys2Path, "usr", "bin", "bash.exe");
+
+	if (!existsSync(envPath)) {
+		console.error(`Error: MSYS2 env not found at ${envPath}`);
+		console.error("Please ensure MSYS2 is properly installed.");
+		process.exit(1);
+	}
+
+	if (!existsSync(bashPath)) {
+		console.error(`Error: MSYS2 bash not found at ${bashPath}`);
+		console.error("Please ensure MSYS2 is properly installed.");
+		process.exit(1);
+	}
+
+	// Convert Windows path to MSYS2-compatible path
+	const msysScriptPath = scriptPath.replace(/\\/g, "/").replace(/^([A-Z]):/, (_, drive) => `/${drive.toLowerCase()}`);
+
+	return new Promise((resolve, reject) => {
+		// Use MSYS2's env.exe to properly set MSYSTEM for the MinGW64 environment
+		// This ensures the PATH and other environment variables are set correctly
+		const child = spawn(envPath, [
+			"MSYSTEM=MINGW64",
+			"CHERE_INVOKING=1",
+			bashPath,
+			"-l",
+			"-c",
+			`bash "${msysScriptPath}"`,
+		], {
+			stdio: "inherit",
+		});
+
+		child.on("error", (err) => {
+			console.error(`Failed to start MSYS2 build: ${err.message}`);
+			reject(err);
+		});
+
+		child.on("close", (code) => {
+			if (code === 0) {
+				console.log("\n✓ Windows build completed successfully");
+				resolve();
+			} else {
+				console.error(`\n✗ Windows build failed with exit code ${code}`);
+				reject(new Error(`Build failed with exit code ${code}`));
+			}
+		});
+	});
 }
 
 function generateWindowsBuildScript(targetDir: string): void {