electrobun 1.15.1 → 1.16.0

package/src/cli/index.ts

@@ -5,12 +5,11 @@ import {
 	readFileSync,
 	writeFileSync,
 	cpSync,
-	rmdirSync,
+	rmSync,
 	mkdirSync,
 	createWriteStream,
 	unlinkSync,
 	readdirSync,
-	rmSync,
 	symlinkSync,
 	statSync,
 	copyFileSync,
@@ -21,6 +20,7 @@ import * as readline from "readline";
 import { OS, ARCH } from "../shared/platform";
 import { DEFAULT_CEF_VERSION_STRING } from "../shared/cef-version";
 import { BUN_VERSION } from "../shared/bun-version";
+import { ELECTROBUN_VERSION } from "../shared/electrobun-version";
 import {
 	getAppFileName,
 	getBundleFileName,
@@ -74,7 +74,21 @@ const indexOfElectrobun = process.argv.findIndex((arg) =>
 );
 const commandArg = process.argv[indexOfElectrobun + 1] || "build";
 
-const ELECTROBUN_DEP_PATH = join(projectRoot, "node_modules", "electrobun");
+// Walk up from projectRoot to find electrobun in node_modules (supports hoisted monorepo layouts)
+function resolveElectrobunDir(): string {
+	let dir = projectRoot;
+	while (dir !== dirname(dir)) {
+		const candidate = join(dir, "node_modules", "electrobun");
+		if (existsSync(join(candidate, "package.json"))) {
+			return candidate;
+		}
+		dir = dirname(dir);
+	}
+	return join(projectRoot, "node_modules", "electrobun");
+}
+
+const ELECTROBUN_DEP_PATH = resolveElectrobunDir();
+const ELECTROBUN_CACHE_PATH = join(dirname(ELECTROBUN_DEP_PATH), ".electrobun-cache");
 
 // When debugging electrobun with the example app use the builds (dev or release) right from the source folder
 // For developers using electrobun cli via npm use the release versions in /dist
@@ -182,18 +196,7 @@ async function ensureCoreDependencies(
 	);
 	console.log(`Downloading core binaries for ${platformOS}-${platformArch}...`);
 
-	// Get the current Electrobun version from package.json
-	const packageJsonPath = join(ELECTROBUN_DEP_PATH, "package.json");
-	let version = "latest";
-
-	if (existsSync(packageJsonPath)) {
-		try {
-			const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
-			version = `v${packageJson.version}`;
-		} catch (error) {
-			console.warn("Could not read package version, using latest");
-		}
-	}
+	const version = `v${ELECTROBUN_VERSION}`;
 
 	const platformName =
 		platformOS === "macos" ? "darwin" : platformOS === "win" ? "win" : "linux";
@@ -366,13 +369,7 @@ function getEffectiveCEFDir(
 	cefVersion?: string,
 ): string {
 	if (cefVersion) {
-		return join(
-			projectRoot,
-			"node_modules",
-			".electrobun-cache",
-			"cef-override",
-			`${platformOS}-${platformArch}`,
-		);
+		return join(ELECTROBUN_CACHE_PATH, "cef-override", `${platformOS}-${platformArch}`);
 	}
 	return getPlatformPaths(platformOS, platformArch).CEF_DIR;
 }
@@ -491,13 +488,7 @@ async function ensureBunBinary(
 	}
 
 	const binExt = targetOS === "win" ? ".exe" : "";
-	const overrideDir = join(
-		projectRoot,
-		"node_modules",
-		".electrobun-cache",
-		"bun-override",
-		`${targetOS}-${targetArch}`,
-	);
+	const overrideDir = join(ELECTROBUN_CACHE_PATH, "bun-override", `${targetOS}-${targetArch}`);
 	const overrideBinary = join(overrideDir, `bun${binExt}`);
 	const versionFile = join(overrideDir, ".bun-version");
 
@@ -557,13 +548,7 @@ async function downloadCustomBun(
 	}
 
 	const binExt = platformOS === "win" ? ".exe" : "";
-	const overrideDir = join(
-		projectRoot,
-		"node_modules",
-		".electrobun-cache",
-		"bun-override",
-		`${platformOS}-${platformArch}`,
-	);
+	const overrideDir = join(ELECTROBUN_CACHE_PATH, "bun-override", `${platformOS}-${platformArch}`);
 	const overrideBinary = join(overrideDir, `bun${binExt}`);
 	const bunUrl = `https://github.com/oven-sh/bun/releases/download/bun-v${bunVersion}/${bunUrlSegment}`;
 
@@ -628,7 +613,7 @@ async function downloadCustomBun(
 				{ stdio: "inherit" },
 			);
 		} else {
-			execSync(`unzip -o "${tempZipPath}" -d "${overrideDir}"`, {
+			execSync(`unzip -o ${escapePathForTerminal(tempZipPath)} -d ${escapePathForTerminal(overrideDir)}`, {
 				stdio: "inherit",
 			});
 		}
@@ -645,7 +630,7 @@ async function downloadCustomBun(
 
 		// Set execute permissions on non-Windows
 		if (platformOS !== "win") {
-			execSync(`chmod +x "${overrideBinary}"`);
+			execSync(`chmod +x ${escapePathForTerminal(overrideBinary)}`);
 		}
 
 		// Write version stamp
@@ -735,18 +720,7 @@ async function ensureCEFDependencies(
 		`CEF dependencies not found for ${platformOS}-${platformArch}, downloading...`,
 	);
 
-	// Get the current Electrobun version from package.json
-	const packageJsonPath = join(ELECTROBUN_DEP_PATH, "package.json");
-	let version = "latest";
-
-	if (existsSync(packageJsonPath)) {
-		try {
-			const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
-			version = `v${packageJson.version}`;
-		} catch (error) {
-			console.warn("Could not read package version, using latest");
-		}
-	}
+	const version = `v${ELECTROBUN_VERSION}`;
 
 	const platformName =
 		platformOS === "macos" ? "darwin" : platformOS === "win" ? "win" : "linux";
@@ -1386,6 +1360,7 @@ const defaultConfig = {
 		locales: undefined as string[] | "*" | undefined, // ICU locales subset (Linux/Windows)
 		mac: {
 			codesign: false,
+			createDmg: true,
 			notarize: false,
 			bundleCEF: false,
 			bundleWGPU: false,
@@ -1398,21 +1373,21 @@ const defaultConfig = {
 			} as Record<string, boolean | string>,
 			icons: "icon.iconset",
 			defaultRenderer: undefined as "native" | "cef" | undefined,
-			chromiumFlags: undefined as Record<string, string | true> | undefined,
+			chromiumFlags: undefined as Record<string, string | boolean> | undefined,
 		},
 		win: {
 			bundleCEF: false,
 			bundleWGPU: false,
 			icon: undefined as string | undefined,
 			defaultRenderer: undefined as "native" | "cef" | undefined,
-			chromiumFlags: undefined as Record<string, string | true> | undefined,
+			chromiumFlags: undefined as Record<string, string | boolean> | undefined,
 		},
 		linux: {
 			bundleCEF: false,
 			bundleWGPU: false,
 			icon: undefined as string | undefined,
 			defaultRenderer: undefined as "native" | "cef" | undefined,
-			chromiumFlags: undefined as Record<string, string | true> | undefined,
+			chromiumFlags: undefined as Record<string, string | boolean> | undefined,
 		},
 		bun: {
 			entrypoint: "src/bun/index.ts",
@@ -1480,7 +1455,11 @@ function escapeXml(str: string): string {
 
 // Helper functions
 function escapePathForTerminal(path: string): string {
-	return `"${path.replace(/"/g, '\\"')}"`;
+	if (OS === "win") {
+		return `"${path.replace(/"/g, '""')}"`;
+	} else {
+		return `'${path.replace(/'/g, "'\\''")}'`;
+	}
 }
 
 /**
@@ -2021,7 +2000,7 @@ Categories=Utility;Application;
 
 		// refresh build folder
 		if (existsSync(buildFolder)) {
-			rmdirSync(buildFolder, { recursive: true });
+			rmSync(buildFolder, { recursive: true });
 		}
 		mkdirSync(buildFolder, { recursive: true });
 		// bundle bun to build/bun
@@ -2629,7 +2608,7 @@ Categories=Utility;Application;
 								// Fallback to copying the file
 								cpSync(cefFilePath, mainDirPath, { dereference: true });
 								console.log(
-									`Fallback: Copied CEF library to main directory: ${soFile}`,
+									`Fallback: Copying CEF library to main directory: ${soFile}`,
 								);
 							}
 						}
@@ -3053,7 +3032,7 @@ Categories=Utility;Application;
 				console.log("✓ Created app.asar");
 
 				// Remove the entire app folder since it's now packed in ASAR
-				rmdirSync(appDirPath, { recursive: true });
+				rmSync(appDirPath, { recursive: true });
 				console.log("✓ Removed app/ folder (now in ASAR)");
 			}
 		}
@@ -3212,7 +3191,7 @@ Categories=Utility;Application;
 
 			// Remove the app bundle folder after tarring (except on Linux where it might be needed for dev)
 			if (targetOS !== "linux" || buildEnvironment !== "dev") {
-				rmdirSync(appBundleFolderPath, { recursive: true });
+				rmSync(appBundleFolderPath, { recursive: true });
 			}
 
 			// generate bsdiff
@@ -3516,7 +3495,7 @@ Categories=Utility;Application;
 			}
 
 			// DMG creation for macOS only
-			if (targetOS === "macos") {
+			if (targetOS === "macos" && config.build.mac?.createDmg !== false) {
 				console.log("creating dmg...");
 				const finalDmgPath = join(buildFolder, `${appFileName}.dmg`);
 				// NOTE: For some ungodly reason using the bare name in CI can conflict with some mysterious
@@ -3586,6 +3565,9 @@ Categories=Utility;Application;
 					}
 				}
 			} else {
+				if (targetOS === "macos") {
+					console.log("skipping dmg");
+				}
 				// For Windows and Linux, add the self-extracting bundle directly
 				// @ts-expect-error - reserved for future use
 				const _platformBundlePath = join(
@@ -3639,7 +3621,7 @@ Categories=Utility;Application;
 			console.log("creating artifacts folder...");
 			if (existsSync(artifactFolder)) {
 				console.info("deleting artifact folder: ", artifactFolder);
-				rmdirSync(artifactFolder, { recursive: true });
+				rmSync(artifactFolder, { recursive: true });
 			}
 
 			mkdirSync(artifactFolder, { recursive: true });
@@ -4585,7 +4567,7 @@ Categories=Utility;Application;
 					} else if (entry.isFile()) {
 						// Check if it's an executable or library
 						try {
-							const fileInfo = execSync(`file -b "${fullPath}"`, {
+							const fileInfo = execSync(`file -b ${escapePathForTerminal(fullPath)}`, {
 								encoding: "utf8",
 							}).trim();
 							if (
@@ -4638,6 +4620,28 @@ Categories=Utility;Application;
 			}
 		}
 
+		// Sign .node native modules in Resources/app/bun
+		const resourcesPath = join(contentsPath, "Resources", "app", "bun");
+		if (existsSync(resourcesPath)) {
+			console.log("Signing native modules in Resources/app/bun...");
+			try {
+				const nodeFiles = execSync(`find ${escapePathForTerminal(resourcesPath)} -name "*.node" -type f`, {
+					encoding: "utf8",
+				}).trim().split("\n").filter(Boolean);
+
+				for (const nodeFile of nodeFiles) {
+					if (nodeFile) {
+						console.log(`Signing native module: ${nodeFile.replace(resourcesPath + "/", "")}`);
+						execSync(
+							`codesign --force --verbose --timestamp --sign "${ELECTROBUN_DEVELOPER_ID}" --options runtime ${escapePathForTerminal(nodeFile)}`,
+						);
+					}
+				}
+			} catch (err) {
+				console.error("Error signing native modules:", err);
+			}
+		}
+
 		// Note: main.js is now in Resources and will be automatically sealed when signing the app bundle
 
 		// Sign the main executable (launcher) - this should use the app's bundle identifier, not "launcher"
@@ -4700,43 +4704,58 @@ Categories=Utility;Application;
 		// }
 
 		const ELECTROBUN_APPLEID = process.env["ELECTROBUN_APPLEID"];
-
-		if (!ELECTROBUN_APPLEID) {
-			console.error("Env var ELECTROBUN_APPLEID is required to notarize");
-			process.exit(1);
-		}
-
 		const ELECTROBUN_APPLEIDPASS = process.env["ELECTROBUN_APPLEIDPASS"];
+		const ELECTROBUN_TEAMID = process.env["ELECTROBUN_TEAMID"];
 
-		if (!ELECTROBUN_APPLEIDPASS) {
-			console.error("Env var ELECTROBUN_APPLEIDPASS is required to notarize");
-			process.exit(1);
-		}
+		const ELECTROBUN_APPLEAPIISSUER = process.env["ELECTROBUN_APPLEAPIISSUER"];
+		const ELECTROBUN_APPLEAPIKEY = process.env["ELECTROBUN_APPLEAPIKEY"];
+		const ELECTROBUN_APPLEAPIKEYPATH = process.env["ELECTROBUN_APPLEAPIKEYPATH"];
 
-		const ELECTROBUN_TEAMID = process.env["ELECTROBUN_TEAMID"];
+		const useApiKey = ELECTROBUN_APPLEAPIISSUER && ELECTROBUN_APPLEAPIKEY && ELECTROBUN_APPLEAPIKEYPATH;
+		const useAppleId = ELECTROBUN_APPLEID && ELECTROBUN_APPLEIDPASS && ELECTROBUN_TEAMID;
 
-		if (!ELECTROBUN_TEAMID) {
-			console.error("Env var ELECTROBUN_TEAMID is required to notarize");
+		if (!useApiKey && !useAppleId) {
+			console.error("Provide either App Store Connect API key credentials (ELECTROBUN_APPLEAPIISSUER, ELECTROBUN_APPLEAPIKEY, ELECTROBUN_APPLEAPIKEYPATH) or Apple ID credentials (ELECTROBUN_APPLEID, ELECTROBUN_APPLEIDPASS, ELECTROBUN_TEAMID) to notarize");
 			process.exit(1);
 		}
 
-		// notarize
-		// todo (yoav): follow up on options here like --s3-acceleration and --webhook
-		// todo (yoav): don't use execSync since it's blocking and we'll only see the output at the end
-		const statusInfo = execSync(
-			`xcrun notarytool submit --apple-id "${ELECTROBUN_APPLEID}" --password "${ELECTROBUN_APPLEIDPASS}" --team-id "${ELECTROBUN_TEAMID}" --wait ${escapePathForTerminal(
-				fileToNotarize,
-			)}`,
-		).toString();
+		let statusInfo: string;
+		if (useApiKey) {
+			if (!existsSync(ELECTROBUN_APPLEAPIKEYPATH)) {
+				console.error(`ELECTROBUN_APPLEAPIKEYPATH does not exist: ${ELECTROBUN_APPLEAPIKEYPATH}`);
+				process.exit(1);
+			}
+			statusInfo = execSync(
+				`xcrun notarytool submit --key "${ELECTROBUN_APPLEAPIKEYPATH}" --key-id "${ELECTROBUN_APPLEAPIKEY}" --issuer "${ELECTROBUN_APPLEAPIISSUER}" --wait ${escapePathForTerminal(
+					fileToNotarize,
+				)}`,
+			).toString();
+		} else {
+			// notarize
+			// todo (yoav): follow up on options here like --s3-acceleration and --webhook
+			// todo (yoav): don't use execSync since it's blocking and we'll only see the output at the end
+			statusInfo = execSync(
+				`xcrun notarytool submit --apple-id "${ELECTROBUN_APPLEID}" --password "${ELECTROBUN_APPLEIDPASS}" --team-id "${ELECTROBUN_TEAMID}" --wait ${escapePathForTerminal(
+					fileToNotarize,
+				)}`,
+			).toString();
+		}
 		const uuid = statusInfo.match(/id: ([^\n]+)/)?.[1];
 		console.log("statusInfo", statusInfo);
 		console.log("uuid", uuid);
 
 		if (statusInfo.match("Current status: Invalid")) {
 			console.error("notarization failed", statusInfo);
-			const log = execSync(
-				`xcrun notarytool log --apple-id "${ELECTROBUN_APPLEID}" --password "${ELECTROBUN_APPLEIDPASS}" --team-id "${ELECTROBUN_TEAMID}" ${uuid}`,
-			).toString();
+			let log: string;
+			if (useApiKey) {
+				log = execSync(
+					`xcrun notarytool log --key "${ELECTROBUN_APPLEAPIKEYPATH}" --key-id "${ELECTROBUN_APPLEAPIKEY}" --issuer "${ELECTROBUN_APPLEAPIISSUER}" ${uuid}`,
+				).toString();
+			} else {
+				log = execSync(
+					`xcrun notarytool log --apple-id "${ELECTROBUN_APPLEID}" --password "${ELECTROBUN_APPLEIDPASS}" --team-id "${ELECTROBUN_TEAMID}" ${uuid}`,
+				).toString();
+			}
 			console.log("log", log);
 			process.exit(1);
 		}