@hot-updater/apple-helper 0.25.8 → 0.25.10

package/dist/index.cjs

@@ -37,6 +37,8 @@ let node_os = require("node:os");
 node_os = __toESM(node_os);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
+let stream_promises = require("stream/promises");
+stream_promises = __toESM(stream_promises);
 
 //#region src/utils/cocoapods.ts
 const installPodsIfNeeded = async (sourceDir) => {
@@ -102,26 +104,6 @@ const createRandomTmpDir = async (prefix = "apple-helper-") => {
 	return await (0, node_fs_promises.mkdtemp)((0, node_path.join)((0, node_os.tmpdir)(), prefix));
 };
 
-//#endregion
-//#region src/utils/createXcodebuildLogger.ts
-const createXcodebuildLogger = () => new __hot_updater_cli_tools.BuildLogger({
-	failurePatterns: ["BUILD FAILED", "ARCHIVE FAILED"],
-	importantLogPatterns: [
-		"error:",
-		"** BUILD FAILED **",
-		"** ARCHIVE FAILED **",
-		"The following build commands failed:"
-	],
-	progressMapping: [
-		[["[CP-User] [RN]Check rncore"], 10],
-		[["[CP-User] [Hermes] Replace Hermes"], 35],
-		[["[CP-User] [RN]Check FBReactNativeSpec"], 53],
-		[["React-FabricComponents"], 66],
-		[["[CP] Check Pods Manifest.lock"], 90],
-		[["BUILD SUCCEEDED", "ARCHIVE SUCCEEDED"], 100]
-	]
-});
-
 //#endregion
 //#region src/utils/platform.ts
 /**
@@ -202,56 +184,213 @@ const prettifyXcodebuildError = (error) => {
 	return /* @__PURE__ */ new Error(`Xcodebuild failed: ${error}`);
 };
 
+//#endregion
+//#region src/utils/createXcodebuildLogger.ts
+const createXcodebuildLogger = ({ logPrefix }) => new __hot_updater_cli_tools.BuildLogger({
+	logPrefix,
+	importantLogPatterns: [
+		"error:",
+		"** BUILD FAILED **",
+		"** ARCHIVE FAILED **",
+		"The following build commands failed:",
+		"note: Building targets in dependency order",
+		"note: Target dependency graph",
+		"Running script",
+		"[CP-User]",
+		"[CP] Check Pods Manifest.lock",
+		"Build Succeeded"
+	],
+	progressStages: [
+		["Building targets in dependency order", "Target dependency graph"],
+		["Write Auxiliary File", "[CP] Check Pods Manifest.lock"],
+		[
+			"Running script",
+			"[CP-User] [RN]Check rncore",
+			"[CP-User] [Hermes] Replace Hermes",
+			"[CP-User] [RN]Check FBReactNativeSpec"
+		],
+		[
+			"Processing",
+			"ProcessProductPackaging",
+			"ProcessProductPackagingDER"
+		],
+		["Compiling"],
+		["RegisterExecutionPolicyException"],
+		["Touching"],
+		["Building library", "Create Universal Binary"],
+		["Copying"],
+		[
+			"Build Succeeded",
+			"BUILD SUCCEEDED",
+			"ARCHIVE SUCCEEDED"
+		]
+	]
+});
+
+//#endregion
+//#region src/utils/runXcodebuildWithLogging.ts
+let cachedXcbeautifyAvailability = null;
+const TERMINATION_SIGNALS = ["SIGINT", "SIGTERM"];
+const IGNORED_PIPELINE_ERROR_CODES = ["EPIPE", "ERR_STREAM_PREMATURE_CLOSE"];
+const isXcbeautifyAvailable = async () => {
+	if (cachedXcbeautifyAvailability !== null) return cachedXcbeautifyAvailability;
+	try {
+		await (0, execa.execa)("which", ["xcbeautify"]);
+		cachedXcbeautifyAvailability = true;
+		return true;
+	} catch {
+		cachedXcbeautifyAvailability = false;
+		return false;
+	}
+};
+const createRawXcodebuildProcess = ({ args, sourceDir }) => {
+	return (0, execa.execa)("xcodebuild", args, {
+		cwd: sourceDir,
+		all: true,
+		env: {
+			...process.env,
+			NSUnbufferedIO: "YES"
+		}
+	});
+};
+const createXcbeautifyProcess = ({ cwd }) => {
+	return (0, execa.execa)("xcbeautify", [], {
+		cwd,
+		all: true
+	});
+};
+const getErrorCode = (error) => {
+	if (typeof error !== "object" || error === null || !("code" in error)) return "";
+	const { code } = error;
+	return typeof code === "string" ? code : "";
+};
+const shouldIgnorePipelineError = (error) => {
+	const errorCode = getErrorCode(error);
+	return IGNORED_PIPELINE_ERROR_CODES.includes(errorCode);
+};
+const createXcodebuildOutputPipingPromise = async ({ xcodebuildOutput, xcbeautifyInput }) => {
+	try {
+		return await (0, stream_promises.pipeline)(xcodebuildOutput, xcbeautifyInput);
+	} catch (error) {
+		if (shouldIgnorePipelineError(error)) return;
+		throw error;
+	}
+};
+const processOutputStream = async ({ outputStream, logger }) => {
+	if (!outputStream) return;
+	await logger.processStream(outputStream);
+};
+const runXcodebuildWithLogging = async ({ args, sourceDir, successMessage, failureMessage, logPrefix }) => {
+	const useXcbeautify = await isXcbeautifyAvailable();
+	const logger = createXcodebuildLogger({ logPrefix });
+	await logger.start();
+	const activeProcesses = [];
+	const terminateActiveProcesses = () => {
+		for (const activeProcess of activeProcesses) activeProcess.kill();
+	};
+	for (const signal of TERMINATION_SIGNALS) process.once(signal, terminateActiveProcesses);
+	try {
+		if (useXcbeautify) {
+			const xcodebuildProcess = createRawXcodebuildProcess({
+				args,
+				sourceDir
+			});
+			const xcbeautifyProcess = createXcbeautifyProcess({ cwd: sourceDir });
+			activeProcesses.push(xcodebuildProcess, xcbeautifyProcess);
+			const xcodebuildOutput = xcodebuildProcess.all ?? xcodebuildProcess.stdout;
+			const xcbeautifyInput = xcbeautifyProcess.stdin;
+			if (!xcodebuildOutput || !xcbeautifyInput) throw new Error("Failed to pipe xcodebuild output into xcbeautify");
+			const pipingPromise = createXcodebuildOutputPipingPromise({
+				xcodebuildOutput,
+				xcbeautifyInput
+			});
+			await processOutputStream({
+				logger,
+				outputStream: xcbeautifyProcess.all ?? xcbeautifyProcess.stdout
+			});
+			await Promise.all([
+				xcbeautifyProcess,
+				xcodebuildProcess,
+				pipingPromise
+			]);
+		} else {
+			const xcodebuildProcess = createRawXcodebuildProcess({
+				args,
+				sourceDir
+			});
+			activeProcesses.push(xcodebuildProcess);
+			await processOutputStream({
+				logger,
+				outputStream: xcodebuildProcess.all ?? xcodebuildProcess.stdout
+			});
+			await xcodebuildProcess;
+		}
+		logger.stop(successMessage);
+	} catch (error) {
+		logger.writeError(error);
+		logger.stop(failureMessage, false);
+		throw error;
+	} finally {
+		for (const signal of TERMINATION_SIGNALS) process.off(signal, terminateActiveProcesses);
+		await logger.close();
+	}
+};
+
 //#endregion
 //#region src/builder/archiveXcodeProject.ts
-const archiveXcodeProject = async ({ sourceDir, platform, schemeConfig }) => {
+const archiveXcodeProject = async ({ sourceDir, platform, installPods, destination, extraParams, configuration, xcodeScheme, xcconfig, logPrefix }) => {
 	const xcodeProject = await parseXcodeProjectInfo(sourceDir);
-	if (schemeConfig.installPods ?? true) await installPodsIfNeeded(sourceDir);
+	if (installPods) await installPodsIfNeeded(sourceDir);
 	const tmpDir = await createRandomTmpDir();
 	const archiveName = `${xcodeProject.name.replace(".xcworkspace", "").replace(".xcodeproj", "")}.xcarchive`;
 	const archivePath = path.default.join(tmpDir, archiveName);
 	const archiveArgs = prepareArchiveArgs({
 		archivePath,
 		platform,
-		schemeConfig,
 		sourceDir,
-		xcodeProject
+		xcodeProject,
+		configuration,
+		extraParams,
+		destination,
+		xcconfig,
+		xcodeScheme
 	});
 	__hot_updater_cli_tools.p.log.info(`Xcode Archive Settings:
 Project    ${xcodeProject.name}
-Scheme     ${schemeConfig.scheme}
+Scheme     ${xcodeScheme}
 Platform   ${platform}
 Command    xcodebuild ${archiveArgs.join(" ")}
 `);
-	const logger = createXcodebuildLogger();
-	logger.start(`${xcodeProject.name} (Archive)`);
 	try {
-		const process$1 = (0, execa.execa)("xcodebuild", archiveArgs, { cwd: sourceDir });
-		for await (const line of process$1) logger.processLine(line);
-		logger.stop("Archive completed successfully");
+		await runXcodebuildWithLogging({
+			args: archiveArgs,
+			failureMessage: "Archive failed",
+			logPrefix,
+			sourceDir,
+			successMessage: "Archive completed successfully"
+		});
 		return { archivePath };
 	} catch (error) {
-		logger.stop("Archive failed", false);
 		throw prettifyXcodebuildError(error);
 	}
 };
-const prepareArchiveArgs = ({ archivePath, platform, schemeConfig, sourceDir, xcodeProject }) => {
+const prepareArchiveArgs = ({ xcodeScheme, archivePath, platform, sourceDir, xcodeProject, configuration = "Release", xcconfig, extraParams, destination = [] }) => {
 	const args = [
 		xcodeProject.isWorkspace ? "-workspace" : "-project",
 		path.default.join(sourceDir, xcodeProject.name),
 		"-scheme",
-		schemeConfig.scheme,
+		xcodeScheme,
 		"-configuration",
-		schemeConfig.configuration || "Release",
+		configuration,
 		"archive",
 		"-archivePath",
 		archivePath,
 		`HOT_UPDATER_MIN_BUNDLE_ID=${(0, __hot_updater_plugin_core.generateMinBundleId)()}`
 	];
-	if (schemeConfig.xcconfig) args.push("-xcconfig", schemeConfig.xcconfig);
-	if (schemeConfig.extraParams) args.push(...schemeConfig.extraParams);
+	if (xcconfig) args.push("-xcconfig", xcconfig);
+	if (extraParams) args.push(...extraParams);
 	const resolvedDestinations = resolveDestinations({
-		destinations: schemeConfig.destination || [],
+		destinations: destination,
 		useGeneric: true
 	});
 	if (resolvedDestinations.length === 0) resolvedDestinations.push(getDefaultDestination({
@@ -259,209 +398,94 @@ const prepareArchiveArgs = ({ archivePath, platform, schemeConfig, sourceDir, xc
 		platform,
 		useGeneric: true
 	}));
-	for (const destination of resolvedDestinations) args.push("-destination", destination);
+	for (const destination$1 of resolvedDestinations) args.push("-destination", destination$1);
 	return args;
 };
 
-//#endregion
-//#region src/builder/exportXcodeArchive.ts
-const exportXcodeArchive = async ({ archivePath, sourceDir, exportExtraParams, exportOptionsPlist }) => {
-	const exportPath = await createRandomTmpDir();
-	const exportArgs = prepareExportArgs({
-		archivePath,
-		exportPath,
-		exportOptionsPlist,
-		exportExtraParams
-	});
-	const spinner = __hot_updater_cli_tools.p.spinner();
-	spinner.start("Exporting archive to IPA");
-	try {
-		await (0, execa.execa)("xcodebuild", exportArgs, { cwd: sourceDir });
-		spinner.stop("Archive exported successfully");
-		return { exportPath };
-	} catch (error) {
-		spinner.stop("Export failed");
-		throw prettifyXcodebuildError(error);
-	}
-};
-const prepareExportArgs = ({ exportPath, archivePath, exportExtraParams, exportOptionsPlist }) => {
-	const args = [
-		"-exportArchive",
-		"-archivePath",
-		archivePath,
-		"-exportPath",
-		exportPath
-	];
-	if (exportExtraParams) args.push(...exportExtraParams);
-	args.push("-exportOptionsPlist", exportOptionsPlist);
-	return args;
-};
-
-//#endregion
-//#region src/utils/assertXcodebuildExist.ts
-const assertXcodebuildExist = async () => {
-	try {
-		await (0, execa.execa)("which", ["xcodebuild"]);
-	} catch {
-		__hot_updater_cli_tools.p.log.error(`${__hot_updater_cli_tools.colors.blueBright("xcodebuild")} resolve failed. Ensure that xcode is installed on your machine or xcodebuild is included in your path`);
-		process.exit(1);
-	}
-};
-
-//#endregion
-//#region src/utils/enrichNativeBuildIosScheme.ts
-const resolveExportOptionsPlist = (exportOptionsPlist) => {
-	const resolvedExportOptionsPlist = exportOptionsPlist ? path.default.isAbsolute(exportOptionsPlist) ? exportOptionsPlist : path.default.resolve((0, __hot_updater_cli_tools.getCwd)(), exportOptionsPlist) : void 0;
-	if (resolvedExportOptionsPlist && !fs.default.existsSync(resolvedExportOptionsPlist)) {
-		__hot_updater_cli_tools.p.log.error(`exportOptionsPlist doesn't exist in ${resolvedExportOptionsPlist}`);
-		process.exit(1);
-	}
-	return resolvedExportOptionsPlist;
-};
-const enrichNativeBuildIosScheme = async (scheme) => {
-	return {
-		platform: "ios",
-		installPods: true,
-		configuration: "Release",
-		destination: [],
-		...scheme,
-		exportOptionsPlist: resolveExportOptionsPlist(scheme.exportOptionsPlist)
-	};
-};
-
-//#endregion
-//#region src/buildIos.ts
-const buildIos = async ({ schemeConfig: _schemeConfig }) => {
-	await assertXcodebuildExist();
-	const iosProjectRoot = path.default.join((0, __hot_updater_cli_tools.getCwd)(), "ios");
-	const schemeConfig = await enrichNativeBuildIosScheme(_schemeConfig);
-	const buildDirectory = await createRandomTmpDir();
-	const archiveDir = path.default.join(buildDirectory, "archive");
-	const exportDir = path.default.join(buildDirectory, "export");
-	await fs.default.promises.mkdir(archiveDir, { recursive: true });
-	const { archivePath } = await archiveXcodeProject({
-		platform: schemeConfig.platform,
-		schemeConfig,
-		sourceDir: iosProjectRoot
-	});
-	const finalArchivePath = path.default.join(archiveDir, path.default.basename(archivePath));
-	await fs.default.promises.cp(archivePath, finalArchivePath, { recursive: true });
-	const appFromArchive = extractAppFromXcarchive(finalArchivePath);
-	if (appFromArchive) {
-		await fs.default.promises.cp(appFromArchive, path.default.join(archiveDir, path.default.basename(appFromArchive)), { recursive: true });
-		__hot_updater_cli_tools.p.log.success(".app extracted from .xcarchive");
-	}
-	if (schemeConfig.exportOptionsPlist) {
-		await fs.default.promises.mkdir(exportDir, { recursive: true });
-		const { exportPath } = await exportXcodeArchive({
-			archivePath,
-			exportExtraParams: schemeConfig.exportExtraParams,
-			exportOptionsPlist: schemeConfig.exportOptionsPlist,
-			sourceDir: iosProjectRoot
-		});
-		await fs.default.promises.cp(exportPath, exportDir, { recursive: true });
-		const ipaFile = fs.default.readdirSync(exportDir).find((file) => file.endsWith(".ipa"));
-		if (ipaFile) return {
-			buildDirectory,
-			buildArtifactPath: path.default.join(exportDir, ipaFile)
-		};
-		throw new Error("IPA file not found after export");
-	}
-	return {
-		buildDirectory,
-		buildArtifactPath: finalArchivePath
-	};
-};
-const extractAppFromXcarchive = (archivePath) => {
-	const productsPath = path.default.join(archivePath, "Products", "Applications");
-	if (!fs.default.existsSync(productsPath)) return;
-	const appFile = fs.default.readdirSync(productsPath).find((file) => file.endsWith(".app"));
-	if (appFile) return path.default.join(productsPath, appFile);
-	__hot_updater_cli_tools.p.log.warn("Failed to extract .app from xcarchive");
-};
-
 //#endregion
 //#region src/builder/buildXcodeProject.ts
-const buildXcodeProject = async ({ sourceDir, platform, scheme, configuration, deviceType, udid, installPods, extraParams }) => {
+const buildXcodeProject = async ({ sourceDir, platform, xcodeScheme, configuration, deviceType, logPrefix, destination = [], useGenericDestination = false, installPods, extraParams }) => {
 	const xcodeProject = await parseXcodeProjectInfo(sourceDir);
-	if (installPods ?? true) await installPodsIfNeeded(sourceDir);
+	if (installPods) await installPodsIfNeeded(sourceDir);
 	const derivedDataPath = await createRandomTmpDir();
+	const resolvedDestinations = resolveDestinations({
+		destinations: destination,
+		useGeneric: useGenericDestination
+	});
+	if (resolvedDestinations.length === 0) resolvedDestinations.push(getDefaultDestination({
+		deviceType,
+		platform,
+		useGeneric: useGenericDestination
+	}));
 	const buildArgs = prepareBuildArgs({
 		configuration,
 		derivedDataPath,
 		deviceType,
+		resolvedDestinations,
 		extraParams,
 		platform,
-		scheme,
+		xcodeScheme,
 		sourceDir,
-		udid,
 		xcodeProject
 	});
 	__hot_updater_cli_tools.p.log.info(`Xcode Build Settings:
 Project        ${xcodeProject.name}
-Scheme         ${scheme}
+Scheme         ${xcodeScheme}
 Configuration  ${configuration}
 Platform       ${platform}
 Device Type    ${deviceType}
 Command        xcodebuild ${buildArgs.join(" ")}
 `);
-	const logger = createXcodebuildLogger();
-	logger.start(`${xcodeProject.name} (Build)`);
 	try {
-		const process$1 = (0, execa.execa)("xcodebuild", buildArgs, { cwd: sourceDir });
-		for await (const line of process$1) logger.processLine(line);
-		logger.stop("Build completed successfully");
+		await runXcodebuildWithLogging({
+			args: buildArgs,
+			sourceDir,
+			logPrefix,
+			successMessage: "Build completed successfully",
+			failureMessage: "Build failed"
+		});
 		return await getBuildSettings({
 			configuration,
 			derivedDataPath,
-			deviceType,
-			platform,
-			scheme,
+			resolvedDestinations,
+			xcodeScheme,
 			sourceDir,
-			udid,
 			xcodeProject
 		});
 	} catch (error) {
-		logger.stop("Build failed", false);
 		throw prettifyXcodebuildError(error);
 	}
 };
-const prepareBuildArgs = ({ xcodeProject, sourceDir, platform, scheme, configuration, deviceType, udid, derivedDataPath, extraParams }) => {
+const prepareBuildArgs = ({ xcodeProject, sourceDir, platform, xcodeScheme, configuration, deviceType, resolvedDestinations, derivedDataPath, extraParams }) => {
 	const sdk = deviceType === "simulator" ? platformConfigs[platform].simulatorSdk : platformConfigs[platform].deviceSdk;
-	const destination = udid ? `id=${udid}` : deviceType === "simulator" ? platformConfigs[platform].simulatorDestination : platformConfigs[platform].deviceDestination;
 	const args = [
 		xcodeProject.isWorkspace ? "-workspace" : "-project",
 		path.default.join(sourceDir, xcodeProject.name),
 		"-scheme",
-		scheme,
+		xcodeScheme,
 		"-configuration",
 		configuration,
 		"-sdk",
 		sdk,
-		"-destination",
-		destination,
 		"-derivedDataPath",
 		derivedDataPath,
 		`HOT_UPDATER_MIN_BUNDLE_ID=${(0, __hot_updater_plugin_core.generateMinBundleId)()}`,
 		"build"
 	];
 	if (extraParams) args.push(...extraParams);
+	for (const dest of resolvedDestinations) args.push("-destination", dest);
 	return args;
 };
-const getBuildSettings = async ({ xcodeProject, sourceDir, platform, scheme, configuration, deviceType, udid, derivedDataPath }) => {
-	const sdk = deviceType === "simulator" ? platformConfigs[platform].simulatorSdk : platformConfigs[platform].deviceSdk;
-	const destination = udid ? `id=${udid}` : deviceType === "simulator" ? platformConfigs[platform].simulatorDestination : platformConfigs[platform].deviceDestination;
+const getBuildSettings = async ({ xcodeProject, sourceDir, xcodeScheme, configuration, resolvedDestinations, derivedDataPath }) => {
+	const destinationArgs = resolvedDestinations.flatMap((dest) => ["-destination", dest]);
 	const { stdout: buildSettings } = await (0, execa.execa)("xcodebuild", [
 		xcodeProject.isWorkspace ? "-workspace" : "-project",
 		xcodeProject.name,
 		"-scheme",
-		scheme,
+		xcodeScheme,
 		"-configuration",
 		configuration,
-		"-sdk",
-		sdk,
-		"-destination",
-		destination,
+		...destinationArgs,
 		"-derivedDataPath",
 		derivedDataPath,
 		"-showBuildSettings",
@@ -483,6 +507,137 @@ const getBuildSettings = async ({ xcodeProject, sourceDir, platform, scheme, con
 	};
 };
 
+//#endregion
+//#region src/builder/exportXcodeArchive.ts
+const exportXcodeArchive = async ({ archivePath, sourceDir, exportExtraParams, exportOptionsPlist, logPrefix }) => {
+	const exportPath = await createRandomTmpDir();
+	const exportArgs = prepareExportArgs({
+		archivePath,
+		exportPath,
+		exportOptionsPlist,
+		exportExtraParams
+	});
+	try {
+		await runXcodebuildWithLogging({
+			args: exportArgs,
+			sourceDir,
+			successMessage: "Archive exported successfully",
+			failureMessage: "Export failed",
+			logPrefix
+		});
+		return { exportPath };
+	} catch (error) {
+		throw prettifyXcodebuildError(error);
+	}
+};
+const prepareExportArgs = ({ exportPath, archivePath, exportExtraParams, exportOptionsPlist }) => {
+	const args = [
+		"-exportArchive",
+		"-archivePath",
+		archivePath,
+		"-exportPath",
+		exportPath
+	];
+	if (exportExtraParams) args.push(...exportExtraParams);
+	args.push("-exportOptionsPlist", exportOptionsPlist);
+	return args;
+};
+
+//#endregion
+//#region src/utils/assertXcodebuildExist.ts
+const assertXcodebuildExist = async () => {
+	try {
+		await (0, execa.execa)("which", ["xcodebuild"]);
+	} catch {
+		__hot_updater_cli_tools.p.log.error(`${__hot_updater_cli_tools.colors.blueBright("xcodebuild")} resolve failed. Ensure that xcode is installed on your machine or xcodebuild is included in your path`);
+		process.exit(1);
+	}
+};
+
+//#endregion
+//#region src/buildIos.ts
+const buildIos = async ({ schemeConfig }) => {
+	await assertXcodebuildExist();
+	const iosProjectRoot = path.default.join((0, __hot_updater_cli_tools.getCwd)(), "ios");
+	const buildDirectory = await createRandomTmpDir();
+	const archiveDir = path.default.join(buildDirectory, "archive");
+	const exportDir = path.default.join(buildDirectory, "export");
+	await fs.default.promises.mkdir(archiveDir, { recursive: true });
+	if (schemeConfig.simulator) {
+		if (schemeConfig.destination.length) {
+			__hot_updater_cli_tools.p.log.error("The scheme option 'simulator' is not compatible with the 'destination' option.");
+			process.exit(1);
+		}
+		const appDir = path.default.join(buildDirectory, "app");
+		await fs.default.promises.mkdir(appDir, { recursive: true });
+		const { appPath } = await buildXcodeProject({
+			sourceDir: iosProjectRoot,
+			logPrefix: `ios-${schemeConfig.hotUpdaterSchemeName}-build`,
+			platform: schemeConfig.platform,
+			xcodeScheme: schemeConfig.scheme,
+			configuration: schemeConfig.configuration,
+			deviceType: "simulator",
+			installPods: schemeConfig.installPods,
+			extraParams: schemeConfig.extraParams,
+			useGenericDestination: true
+		});
+		const finalAppPath = path.default.join(appDir, path.default.basename(appPath));
+		await fs.default.promises.cp(appPath, finalAppPath, { recursive: true });
+		__hot_updater_cli_tools.p.log.success(`.app file created: ${path.default.basename(appPath)}`);
+		return {
+			buildDirectory,
+			buildArtifactPath: finalAppPath
+		};
+	} else {
+		const { archivePath } = await archiveXcodeProject({
+			platform: schemeConfig.platform,
+			sourceDir: iosProjectRoot,
+			xcconfig: schemeConfig.xcconfig,
+			xcodeScheme: schemeConfig.scheme,
+			destination: schemeConfig.destination,
+			extraParams: schemeConfig.extraParams,
+			configuration: schemeConfig.configuration,
+			installPods: schemeConfig.installPods,
+			logPrefix: `ios-${schemeConfig.hotUpdaterSchemeName}-build-archive`
+		});
+		const finalArchivePath = path.default.join(archiveDir, path.default.basename(archivePath));
+		await fs.default.promises.cp(archivePath, finalArchivePath, { recursive: true });
+		const appFromArchive = extractAppFromXcarchive(finalArchivePath);
+		if (appFromArchive) {
+			await fs.default.promises.cp(appFromArchive, path.default.join(archiveDir, path.default.basename(appFromArchive)), { recursive: true });
+			__hot_updater_cli_tools.p.log.success(".app extracted from .xcarchive");
+		}
+		if (schemeConfig.exportOptionsPlist) {
+			await fs.default.promises.mkdir(exportDir, { recursive: true });
+			const { exportPath } = await exportXcodeArchive({
+				archivePath,
+				exportExtraParams: schemeConfig.exportExtraParams,
+				exportOptionsPlist: schemeConfig.exportOptionsPlist,
+				sourceDir: iosProjectRoot,
+				logPrefix: `ios-${schemeConfig.hotUpdaterSchemeName}-build-export`
+			});
+			await fs.default.promises.cp(exportPath, exportDir, { recursive: true });
+			const ipaFile = fs.default.readdirSync(exportDir).find((file) => file.endsWith(".ipa"));
+			if (ipaFile) return {
+				buildDirectory,
+				buildArtifactPath: path.default.join(exportDir, ipaFile)
+			};
+			throw new Error("IPA file not found after export");
+		}
+		return {
+			buildDirectory,
+			buildArtifactPath: finalArchivePath
+		};
+	}
+};
+const extractAppFromXcarchive = (archivePath) => {
+	const productsPath = path.default.join(archivePath, "Products", "Applications");
+	if (!fs.default.existsSync(productsPath)) return;
+	const appFile = fs.default.readdirSync(productsPath).find((file) => file.endsWith(".app"));
+	if (appFile) return path.default.join(productsPath, appFile);
+	__hot_updater_cli_tools.p.log.warn("Failed to extract .app from xcarchive");
+};
+
 //#endregion
 //#region src/runner/deviceRunner.ts
 const installAndLaunchOnDevice = async ({ device, appPath, options }) => {
@@ -768,10 +923,9 @@ const Device = {
 
 //#endregion
 //#region src/runIos.ts
-const runIos = async ({ schemeConfig: _schemeConfig, runOption }) => {
+const runIos = async ({ schemeConfig, runOption }) => {
 	const { interactive, device: deviceOption } = runOption;
 	const iosProjectPath = path.default.join((0, __hot_updater_cli_tools.getCwd)(), "ios");
-	const schemeConfig = await enrichNativeBuildIosScheme(_schemeConfig);
 	const device = await Device.selectTargetDevice({
 		platform: "ios",
 		deviceOption,
@@ -789,12 +943,13 @@ const runIos = async ({ schemeConfig: _schemeConfig, runOption }) => {
 		const result$1 = await buildXcodeProject({
 			sourceDir: iosProjectPath,
 			platform: schemeConfig.platform,
-			scheme: schemeConfig.scheme,
+			xcodeScheme: schemeConfig.scheme,
 			configuration: schemeConfig.configuration,
 			deviceType: selectedDevice.type,
-			udid: selectedDevice.udid,
+			destination: [{ id: selectedDevice.udid }],
 			installPods: schemeConfig.installPods,
-			extraParams: schemeConfig.extraParams
+			extraParams: schemeConfig.extraParams,
+			logPrefix: `ios-${schemeConfig.hotUpdaterSchemeName}-run`
 		});
 		const runnerOptions$1 = {
 			bundleIdentifier: schemeConfig.bundleIdentifier,
@@ -814,12 +969,13 @@ const runIos = async ({ schemeConfig: _schemeConfig, runOption }) => {
 	const result = await buildXcodeProject({
 		sourceDir: iosProjectPath,
 		platform: schemeConfig.platform,
-		scheme: schemeConfig.scheme,
+		xcodeScheme: schemeConfig.scheme,
 		configuration: schemeConfig.configuration,
 		deviceType: device.type,
-		udid: device.udid,
+		destination: [{ id: device.udid }],
 		installPods: schemeConfig.installPods,
-		extraParams: schemeConfig.extraParams
+		extraParams: schemeConfig.extraParams,
+		logPrefix: `ios-${schemeConfig.hotUpdaterSchemeName}-run`
 	});
 	const runnerOptions = {
 		bundleIdentifier: schemeConfig.bundleIdentifier,
@@ -843,6 +999,30 @@ const runIos = async ({ schemeConfig: _schemeConfig, runOption }) => {
 	return result;
 };
 
+//#endregion
+//#region src/utils/enrichNativeBuildIosScheme.ts
+const resolveExportOptionsPlist = (exportOptionsPlist) => {
+	const resolvedExportOptionsPlist = exportOptionsPlist ? path.default.isAbsolute(exportOptionsPlist) ? exportOptionsPlist : path.default.resolve((0, __hot_updater_cli_tools.getCwd)(), exportOptionsPlist) : void 0;
+	if (resolvedExportOptionsPlist && !fs.default.existsSync(resolvedExportOptionsPlist)) {
+		__hot_updater_cli_tools.p.log.error(`exportOptionsPlist doesn't exist in ${resolvedExportOptionsPlist}`);
+		process.exit(1);
+	}
+	return resolvedExportOptionsPlist;
+};
+const enrichNativeBuildIosScheme = async ({ scheme, hotUpdaterSchemeName }) => {
+	return {
+		platform: "ios",
+		installPods: false,
+		configuration: "Release",
+		destination: [],
+		simulator: false,
+		...scheme,
+		exportOptionsPlist: resolveExportOptionsPlist(scheme.exportOptionsPlist),
+		hotUpdaterSchemeName
+	};
+};
+
 //#endregion
 exports.buildIos = buildIos;
+exports.enrichNativeBuildIosScheme = enrichNativeBuildIosScheme;
 exports.runIos = runIos;