chore: recognize catalyst as a platform (like visionOS)

Author: farfromrefug

lib/common/mobile/mac/mac-catalyst-application-manager.ts

@@ -1,7 +1,7 @@
 import { ChildProcess } from "child_process";
 import * as path from "path";
 import { ApplicationManagerBase } from "../application-manager-base";
-import { hook } from "../../helpers";
+import { hook, sleep } from "../../helpers";
 import { cache } from "../../decorators";
 import { IOS_LOG_PREDICATE } from "../../constants";
 import {
@@ -64,12 +64,26 @@ export class MacCatalystApplicationManager extends ApplicationManagerBase {
 
 	public async stopApplication(
 		appData: Mobile.IApplicationData,
+	): Promise<void> {
+		const executablePath = this.getExecutablePath();
+		await this.signalApplication(executablePath, "TERM", appData);
+		if (await this.waitForApplicationExit(executablePath)) {
+			return;
+		}
+		await this.signalApplication(executablePath, "KILL", appData);
+		await this.waitForApplicationExit(executablePath);
+	}
+
+	private async signalApplication(
+		executablePath: string,
+		signal: string,
+		appData: Mobile.IApplicationData,
 	): Promise<void> {
 		try {
 			// Anchored so it never matches our own log stream process.
 			await this.$childProcess.spawnFromEvent(
 				"pkill",
-				["-f", `^${this.getExecutablePath()}$`],
+				[`-${signal}`, "-f", `^${executablePath}$`],
 				"close",
 			);
 		} catch (err) {
@@ -80,6 +94,32 @@ export class MacCatalystApplicationManager extends ApplicationManagerBase {
 		}
 	}
 
+	// Returning before the old instance dies makes open -n spawn a duplicate.
+	private async waitForApplicationExit(
+		executablePath: string,
+	): Promise<boolean> {
+		for (let attempt = 0; attempt < 40; attempt++) {
+			if (!(await this.isApplicationRunning(executablePath))) {
+				return true;
+			}
+			await sleep(50);
+		}
+		return false;
+	}
+
+	private async isApplicationRunning(executablePath: string): Promise<boolean> {
+		try {
+			await this.$childProcess.spawnFromEvent(
+				"pgrep",
+				["-f", `^${executablePath}$`],
+				"close",
+			);
+			return true;
+		} catch (err) {
+			return false;
+		}
+	}
+
 	public async getDebuggableApps(): Promise<
 		Mobile.IDeviceApplicationInformation[]
 	> {

lib/services/bundler/bundler-compiler-service.ts

@@ -11,6 +11,7 @@ import {
 	PackageManagers,
 	CONFIG_FILE_NAME_DISPLAY,
 	VITE_DIST_FOLDER_NAME,
+	PlatformTypes,
 } from "../../constants";
 import {
 	IPackageManager,
@@ -788,6 +789,11 @@ export class BundlerCompilerService
 		const platformKey = platform.toLowerCase();
 		const envData = Object.assign({}, env, { [platformKey]: true });
 
+		// Bundlers only know the base platforms, so Catalyst also flags ios.
+		if (this.$mobileHelper.isCatalystPlatform(platformKey)) {
+			envData[PlatformTypes.ios] = true;
+		}
+
 		const appId = projectData.projectIdentifiers[platform];
 		const appPath = projectData.getAppDirectoryRelativePath();
 		const appResourcesPath = projectData.getAppResourcesRelativeDirectoryPath();

lib/services/ios-project-service.ts

@@ -166,22 +166,24 @@ export class IOSProjectService
 			const requestedPlatform = this.$mobileHelper.normalizePlatformName(
 				this.$options.platformOverride ?? this.$devicePlatformsConstants.iOS,
 			);
-			// Mac Catalyst keeps every iOS convention; only the platform root differs.
-			const platform = this.$mobileHelper.isCatalystPlatform(requestedPlatform)
+			// Mac Catalyst ships no runtime of its own, it reuses the iOS one.
+			const runtimePlatform = this.$mobileHelper.isCatalystPlatform(
+				requestedPlatform,
+			)
 				? this.$devicePlatformsConstants.iOS
 				: requestedPlatform;
 			const projectRoot = this.$options.hostProjectPath
 				? this.$options.hostProjectPath
 				: path.join(projectData.platformsDir, requestedPlatform.toLowerCase());
 			const runtimePackage = this.$projectDataService.getRuntimePackage(
 				projectData.projectDir,
-				platform.toLowerCase() as constants.SupportedPlatform,
+				runtimePlatform.toLowerCase() as constants.SupportedPlatform,
 			);
 
 			this._platformData = {
 				frameworkPackageName: runtimePackage.name,
-				normalizedPlatformName: platform,
-				platformNameLowerCase: platform.toLowerCase(),
+				normalizedPlatformName: requestedPlatform,
+				platformNameLowerCase: requestedPlatform.toLowerCase(),
 				appDestinationDirectoryPath: path.join(
 					projectRoot,
 					projectData.projectName,

lib/services/plugins-service.ts

@@ -640,7 +640,10 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
 				);
 			pluginData.isPlugin = !!cacheData.nativescript;
 			pluginData.pluginPlatformsFolderPath = (platform: string) => {
-				if (this.$mobileHelper.isvisionOSPlatform(platform)) {
+				if (
+					this.$mobileHelper.isvisionOSPlatform(platform) ||
+					this.$mobileHelper.isCatalystPlatform(platform)
+				) {
 					platform = constants.PlatformTypes.ios;
 				}
 				return path.join(

lib/services/project-changes-service.ts

@@ -92,8 +92,10 @@ export class ProjectChangesService implements IProjectChangesService {
 
 			if (
 				!this.$fs.exists(platformResourcesDir) &&
-				platformData.platformNameLowerCase ===
-					this.$devicePlatformsConstants.visionOS.toLowerCase()
+				(platformData.platformNameLowerCase ===
+					this.$devicePlatformsConstants.visionOS.toLowerCase() ||
+					platformData.platformNameLowerCase ===
+						this.$devicePlatformsConstants.Catalyst.toLowerCase())
 			) {
 				platformResourcesDir = path.join(
 					projectData.appResourcesDirectoryPath,