@arkts/image-manager 0.5.9 → 0.5.11

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { fromByteArray } from "base64-js";
 import { RelativePattern, WriteableFlags, createNodeFileSystem } from "vscode-fs";
 
 //#region package.json
-var version = "0.5.9";
+var version = "0.5.11";
 
 //#endregion
 //#region src/common/serializable-content.ts
@@ -349,7 +349,7 @@ var ListsFileImpl = class extends SerializableFileImpl {
 		this.content = listsFileItems.filter((item, index, self) => index === self.findIndex((t) => t.uuid === item.uuid)).filter((item, index, self) => index === self.findIndex((t) => t.name === item.name));
 	}
 	addListsFileItem(listsFileItem) {
-		this.content.push(listsFileItem);
+		this.content.push(Object.fromEntries(Object.entries(listsFileItem).filter(([_, value]) => value !== void 0 && value !== null)));
 		this.removeDuplicateListFileItems(this.content);
 		this._isChanged = true;
 		return new ListsFileItemImpl(this, listsFileItem);
@@ -384,6 +384,54 @@ var ListsFileImpl = class extends SerializableFileImpl {
 //#region src/configs/product/item.ts
 let ProductConfigItem;
 (function(_ProductConfigItem) {
+	function isBaseContent(content) {
+		return typeof content === "object" && content !== null && "name" in content && "screenWidth" in content && "screenHeight" in content && "screenDiagonal" in content && "screenDensity" in content && "visible" in content;
+	}
+	_ProductConfigItem.isBaseContent = isBaseContent;
+	function isBaseFoldContent(content) {
+		return isBaseContent(content) && "outerScreenWidth" in content && "outerScreenHeight" in content && "outerScreenDiagonal" in content;
+	}
+	_ProductConfigItem.isBaseFoldContent = isBaseFoldContent;
+	function isPhoneContent(content) {
+		return isBaseContent(content);
+	}
+	_ProductConfigItem.isPhoneContent = isPhoneContent;
+	function isTabletContent(content) {
+		return isBaseContent(content);
+	}
+	_ProductConfigItem.isTabletContent = isTabletContent;
+	function isTwoInOneContent(content) {
+		return isBaseContent(content);
+	}
+	_ProductConfigItem.isTwoInOneContent = isTwoInOneContent;
+	function isFoldableContent(content) {
+		return isBaseFoldContent(content);
+	}
+	_ProductConfigItem.isFoldableContent = isFoldableContent;
+	function isWideFoldContent(content) {
+		return isBaseFoldContent(content);
+	}
+	_ProductConfigItem.isWideFoldContent = isWideFoldContent;
+	function isTripleFoldContent(content) {
+		return isBaseFoldContent(content) && "outerDoubleScreenWidth" in content && "outerDoubleScreenHeight" in content && "outerDoubleScreenDiagonal" in content;
+	}
+	_ProductConfigItem.isTripleFoldContent = isTripleFoldContent;
+	function isTwoInOneFoldableContent(content) {
+		return isBaseFoldContent(content);
+	}
+	_ProductConfigItem.isTwoInOneFoldableContent = isTwoInOneFoldableContent;
+	function isTVContent(content) {
+		return isBaseContent(content);
+	}
+	_ProductConfigItem.isTVContent = isTVContent;
+	function isWearableContent(content) {
+		return isBaseContent(content);
+	}
+	_ProductConfigItem.isWearableContent = isWearableContent;
+	function isWearableKidContent(content) {
+		return isBaseContent(content);
+	}
+	_ProductConfigItem.isWearableKidContent = isWearableKidContent;
 	function is(value) {
 		return value instanceof ProductConfigItemImpl;
 	}
@@ -754,8 +802,8 @@ var ScreenPresetImpl = class {
 	_customizeScreen;
 	getCustomizeScreenConfig() {
 		if (this._customizeScreen) return this._customizeScreen;
-		if (this.getEmulatorDeviceItem().getContent().deviceType === "foldable" && this.options.productConfigItem.getContent().name === "Customize" && "customizeScreen" in this.options && "customizeFoldableScreen" in this.options) this._customizeScreen = new CustomizeFoldableScreenImpl(this, this.options.customizeScreen, this.options.customizeFoldableScreen);
-		else if (this.options.productConfigItem.getContent().name === "Customize" && "customizeScreen" in this.options) this._customizeScreen = new CustomizeScreenImpl(this, this.options.customizeScreen);
+		if (this.getEmulatorDeviceItem().getContent().deviceType === "foldable" && this.options.productConfigItem.getContent().name === "Customize" && "customizeScreen" in this.options && this.options.customizeScreen !== void 0 && this.options.customizeScreen !== null && "customizeFoldableScreen" in this.options && this.options.customizeFoldableScreen !== void 0 && this.options.customizeFoldableScreen !== null) this._customizeScreen = new CustomizeFoldableScreenImpl(this, this.options.customizeScreen, this.options.customizeFoldableScreen);
+		else if (this.options.productConfigItem.getContent().name === "Customize" && "customizeScreen" in this.options && this.options.customizeScreen !== void 0 && this.options.customizeScreen !== null) this._customizeScreen = new CustomizeScreenImpl(this, this.options.customizeScreen);
 		return this._customizeScreen;
 	}
 	toJSON() {
@@ -840,7 +888,7 @@ var LocalImageImpl = class extends BaseImageImpl {
 		return name?.[name.length - 1];
 	}
 	async createDevice(options) {
-		const { deployedPath, imageBasePath, configPath, logPath, adapter: { join } } = this.getImageManager().getOptions();
+		const { deployedPath, configPath, logPath, sdkPath, defaultSdkPath, adapter: { join } } = this.getImageManager().getOptions();
 		const screen = new ScreenPresetImpl(options.screen);
 		const emulatorDeviceItem = screen.getEmulatorDeviceItem();
 		const productConfigItem = screen.getProductConfigItem();
@@ -851,30 +899,30 @@ var LocalImageImpl = class extends BaseImageImpl {
 			uuid,
 			"name": options.name,
 			"apiVersion": this.getApiVersion().toString(),
-			"cpuNumber": options.cpuNumber.toString(),
+			"cpuNumber": options.cpuNumber?.toString(),
 			"path": deviceFolderPath.fsPath,
-			"memoryRamSize": options.memoryRamSize.toString(),
-			"dataDiskSize": options.dataDiskSize.toString(),
+			"memoryRamSize": options.memoryRamSize?.toString(),
+			"dataDiskSize": options.dataDiskSize?.toString(),
 			"version": this.getSdkPkgFile().data?.version ?? "",
-			"imageDir": this.getRelativePath(),
-			"showVersion": this.getSdkPkgFile().data?.guestVersion ?? "",
-			"harmonyos.sdk.path": imageBasePath.fsPath,
+			"imageDir": this.getRelativePath().endsWith("/") ? this.getRelativePath() : `${this.getRelativePath()}/`,
+			"showVersion": `${this.getSdkPkgFile().data?.guestVersion?.split(" ")[0]} ${this.getSdkPkgFile().data?.platformVersion}(${this.getSdkPkgFile().data?.apiVersion})`,
+			"harmonyos.sdk.path": defaultSdkPath?.fsPath ?? sdkPath.fsPath,
 			"harmonyos.config.path": configPath.fsPath,
 			"harmonyos.log.path": logPath.fsPath,
 			"hw.apiName": this.getSdkPkgFile().data?.platformVersion ?? "",
-			"abi": this.infoFile.abi,
+			"abi": this.infoFile?.abi,
 			"harmonyOSVersion": `${this.getSdkPkgFile().data?.guestVersion?.split(" ")[0]}-${this.getSdkPkgFile().data?.platformVersion}`,
 			"guestVersion": this.getSdkPkgFile().data?.guestVersion ?? "",
-			"diagonalSize": emulatorDeviceItem.getContent().diagonalSize.toString(),
-			"density": emulatorDeviceItem.getContent().density.toString(),
-			"resolutionWidth": emulatorDeviceItem.getContent().resolutionWidth.toString(),
-			"resolutionHeight": emulatorDeviceItem.getContent().resolutionHeight.toString(),
-			"coverResolutionWidth": EmulatorFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().coverResolutionWidth.toString() : void 0,
-			"coverResolutionHeight": EmulatorFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().coverResolutionHeight.toString() : void 0,
-			"coverDiagonalSize": EmulatorFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().coverDiagonalSize.toString() : void 0,
-			"type": emulatorDeviceItem.getContent().deviceType,
+			"diagonalSize": emulatorDeviceItem.getContent()?.diagonalSize?.toString(),
+			"density": emulatorDeviceItem.getContent()?.density?.toString(),
+			"resolutionWidth": emulatorDeviceItem.getContent()?.resolutionWidth?.toString(),
+			"resolutionHeight": emulatorDeviceItem.getContent()?.resolutionHeight?.toString(),
+			"coverResolutionWidth": EmulatorFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.coverResolutionWidth?.toString() : void 0,
+			"coverResolutionHeight": EmulatorFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.coverResolutionHeight?.toString() : void 0,
+			"coverDiagonalSize": EmulatorFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.coverDiagonalSize?.toString() : void 0,
+			"type": emulatorDeviceItem.getContent()?.deviceType,
 			"devModel": productConfigItem.getDevModel(),
-			"model": productConfigItem.getContent().name
+			"model": productConfigItem.getContent()?.name
 		});
 		const device = new DeviceImpl({
 			imageManager: this.getImageManager(),
@@ -883,42 +931,45 @@ var LocalImageImpl = class extends BaseImageImpl {
 			screen
 		});
 		const deviceIniFile = new ConfigIniFileImpl(device, ConfigIniFileImpl.getFileUri(device), {
-			"name": listFileItem.getContent().name,
-			"deviceType": listFileItem.getContent().type,
-			"deviceModel": listFileItem.getContent().devModel,
-			"productModel": listFileItem.getContent().model,
+			"name": listFileItem.getContent()?.name,
+			"deviceType": listFileItem.getContent()?.type,
+			"deviceModel": listFileItem.getContent()?.devModel,
+			"productModel": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? void 0 : listFileItem.getContent()?.model,
 			"vendorCountry": options.vendorCountry ?? "CN",
-			"uuid": listFileItem.getContent().uuid,
+			"uuid": listFileItem.getContent()?.uuid,
 			"configPath": listFileItem.getContent()["harmonyos.config.path"],
 			"logPath": listFileItem.getContent()["harmonyos.log.path"],
 			"sdkPath": listFileItem.getContent()["harmonyos.sdk.path"],
-			"imageSubPath": listFileItem.getContent().imageDir,
-			"instancePath": listFileItem.getContent().path,
+			"imageSubPath": listFileItem.getContent()?.imageDir.endsWith("/") ? listFileItem.getContent()?.imageDir : `${listFileItem.getContent()?.imageDir}/`,
+			"instancePath": listFileItem.getContent()?.path,
 			"os.osVersion": `${this.getSdkPkgFile().data?.guestVersion?.split(" ")[0]} ${this.getSdkPkgFile().data?.platformVersion}(${this.getApiVersion()})`,
 			"os.apiVersion": this.getApiVersion().toString(),
 			"os.softwareVersion": this.getSdkPkgFile().data?.version ?? "",
 			"os.isPublic": options.isPublic ?? true ? "true" : "false",
-			"hw.cpu.arch": listFileItem.getContent().abi,
-			"hw.cpu.ncore": listFileItem.getContent().cpuNumber,
-			"hw.lcd.density": emulatorDeviceItem.getContent().density.toFixed(),
-			"hw.lcd.single.diagonalSize": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().singleDiagonalSize.toString() : void 0,
-			"hw.lcd.single.height": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().singleResolutionHeight.toString() : void 0,
-			"hw.lcd.single.width": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().singleResolutionWidth.toString() : void 0,
-			"hw.lcd.double.diagonalSize": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().doubleDiagonalSize.toString() : void 0,
-			"hw.lcd.double.height": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().doubleResolutionHeight.toString() : void 0,
-			"hw.lcd.double.width": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().doubleResolutionWidth.toString() : void 0,
-			"hw.lcd.phy.height": emulatorDeviceItem.getContent().physicalHeight.toString(),
-			"hw.lcd.phy.width": emulatorDeviceItem.getContent().physicalWidth.toString(),
+			"hw.cpu.arch": listFileItem.getContent()?.abi,
+			"hw.cpu.ncore": listFileItem.getContent()?.cpuNumber,
+			"hw.lcd.density": emulatorDeviceItem.getContent()?.density?.toFixed(),
+			"hw.lcd.single.diagonalSize": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.singleDiagonalSize?.toString() : void 0,
+			"hw.lcd.single.height": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.singleResolutionHeight?.toString() : void 0,
+			"hw.lcd.single.width": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.singleResolutionWidth?.toString() : void 0,
+			"hw.lcd.double.diagonalSize": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.doubleDiagonalSize?.toString() : void 0,
+			"hw.lcd.double.height": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.doubleResolutionHeight?.toString() : void 0,
+			"hw.lcd.double.width": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent()?.doubleResolutionWidth?.toString() : void 0,
+			"hw.lcd.triple.diagonalSize": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().diagonalSize.toString() : void 0,
+			"hw.lcd.triple.height": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().resolutionHeight.toString() : void 0,
+			"hw.lcd.triple.width": EmulatorTripleFoldItem.is(emulatorDeviceItem) ? emulatorDeviceItem.getContent().resolutionWidth.toString() : void 0,
+			"hw.lcd.phy.height": emulatorDeviceItem.getContent()?.physicalHeight?.toString(),
+			"hw.lcd.phy.width": emulatorDeviceItem.getContent()?.physicalWidth?.toString(),
 			"hw.lcd.number": EmulatorTripleFoldItem.is(emulatorDeviceItem) || EmulatorFoldItem.is(emulatorDeviceItem) ? "2" : "1",
-			"hw.ramSize": listFileItem.getContent().memoryRamSize,
-			"hw.dataPartitionSize": listFileItem.getContent().dataDiskSize,
+			"hw.ramSize": listFileItem.getContent()?.memoryRamSize,
+			"hw.dataPartitionSize": listFileItem.getContent()?.dataDiskSize,
 			"isCustomize": "true",
 			"hw.hdc.port": "notset"
 		});
 		device.setConfigIniFile(deviceIniFile);
 		const namedIniFile = new NamedIniFileImpl(device, NamedIniFileImpl.getFileUri(device), {
 			"hvd.ini.encoding": "UTF-8",
-			"path": listFileItem.getContent().path
+			"path": listFileItem.getContent()?.path
 		});
 		device.setNamedIniFile(namedIniFile);
 		await namedIniFile.write();
@@ -1268,58 +1319,64 @@ let OptionsResolver;
 	_OptionsResolver.resolveAdapter = resolveAdapter;
 	async function resolveImageManagerOptions(options) {
 		const adapter = await resolveAdapter(options.adapter);
-		const { os, join, process, URI } = adapter;
+		const { os, join, process, URI, fs } = adapter;
 		function resolveDefaultImageBasePath() {
 			switch (process.platform) {
 				case "win32": return typeof process.env.APPDATA === "string" && process.env.APPDATA.length > 0 ? join(URI.file(process.env.APPDATA), "Local", "Huawei", "Sdk") : join(URI.file(os.homedir()), "AppData", "Local", "Huawei", "Sdk");
 				case "darwin": return join(URI.file(os.homedir()), "Library", "Huawei", "Sdk");
-				default: return join(URI.file(os.homedir()), ".huawei", "Sdk");
+				default: return join(URI.file(os.homedir()), ".Huawei", "Sdk");
 			}
 		}
 		function resolveDefaultDeployedPath() {
 			switch (process.platform) {
 				case "win32": return typeof process.env.APPDATA === "string" && process.env.APPDATA.length > 0 ? join(URI.file(process.env.APPDATA), "Local", "Huawei", "Emulator", "deployed") : join(URI.file(os.homedir()), "AppData", "Local", "Huawei", "Emulator", "deployed");
-				default: return join(URI.file(os.homedir()), ".huawei", "Emulator", "deployed");
+				default: return join(URI.file(os.homedir()), ".Huawei", "Emulator", "deployed");
 			}
 		}
 		function resolveDefaultSdkPath() {
 			switch (process.platform) {
 				case "darwin": return URI.file("/Applications/DevEco-Studio.app/Contents/sdk/default/openharmony");
 				case "win32": return URI.file("C:\\Program Files\\Huawei\\DevEco Studio\\sdk\\default\\openharmony");
-				default: return join(URI.file(os.homedir()), ".huawei", "Sdk", "default", "openharmony");
+				default: return join(URI.file(os.homedir()), ".Huawei", "Sdk", "default", "openharmony");
 			}
 		}
 		function resolveDefaultConfigPath() {
 			switch (process.platform) {
 				case "darwin": return join(URI.file(os.homedir()), "Library", "Application Support", "Huawei", "DevEcoStudio6.0");
 				case "win32": return join(URI.file(process.env.APPDATA ?? os.homedir()), "Roaming", "Huawei", "DevEcoStudio6.0");
-				default: return join(URI.file(os.homedir()), ".huawei", "DevEcoStudio6.0");
+				default: return join(URI.file(os.homedir()), ".Huawei", "DevEcoStudio6.0");
 			}
 		}
 		function resolveDefaultLogPath() {
 			switch (process.platform) {
 				case "darwin": return join(URI.file(os.homedir()), "Library", "Logs", "Huawei", "DevEcoStudio6.0");
 				case "win32": return join(URI.file(process.env.APPDATA ?? os.homedir()), "Local", "Huawei", "DevEcoStudio6.0", "log");
-				default: return join(URI.file(os.homedir()), ".huawei", "DevEcoStudio6.0", "log");
+				default: return join(URI.file(os.homedir()), ".Huawei", "DevEcoStudio6.0", "log");
 			}
 		}
 		function resolveDefaultEmulatorPath() {
 			switch (process.platform) {
 				case "darwin": return URI.file("/Applications/DevEco-Studio.app/Contents/tools/emulator");
 				case "win32": return URI.file("C:\\Program Files\\Huawei\\DevEco Studio\\tools\\emulator");
-				default: return join(URI.file(os.homedir()), ".huawei", "Emulator");
+				default: return join(URI.file(os.homedir()), ".Huawei", "Emulator");
 			}
 		}
 		const imageBasePath = typeof options.imageBasePath === "string" ? options.imageBasePath ? URI.file(options.imageBasePath) : resolveDefaultImageBasePath() : options.imageBasePath ? options.imageBasePath : resolveDefaultImageBasePath();
 		const cachePath = typeof options.cachePath === "string" ? options.cachePath ? URI.file(options.cachePath) : join(imageBasePath, "cache") : options.cachePath ? options.cachePath : join(imageBasePath, "cache");
+		const deployedPath = typeof options.deployedPath === "string" ? options.deployedPath ? URI.file(options.deployedPath) : resolveDefaultDeployedPath() : options.deployedPath ? options.deployedPath : resolveDefaultDeployedPath();
+		const sdkPath = typeof options.sdkPath === "string" ? options.sdkPath ? URI.file(options.sdkPath) : resolveDefaultSdkPath() : options.sdkPath ? options.sdkPath : resolveDefaultSdkPath();
+		const configPath = typeof options.configPath === "string" ? options.configPath ? URI.file(options.configPath) : resolveDefaultConfigPath() : options.configPath ? options.configPath : resolveDefaultConfigPath();
+		const logPath = typeof options.logPath === "string" ? options.logPath ? URI.file(options.logPath) : resolveDefaultLogPath() : options.logPath ? options.logPath : resolveDefaultLogPath();
+		const emulatorPath = typeof options.emulatorPath === "string" ? options.emulatorPath ? URI.file(options.emulatorPath) : resolveDefaultEmulatorPath() : options.emulatorPath ? options.emulatorPath : resolveDefaultEmulatorPath();
 		return {
 			imageBasePath,
-			deployedPath: typeof options.deployedPath === "string" ? options.deployedPath ? URI.file(options.deployedPath) : resolveDefaultDeployedPath() : options.deployedPath ? options.deployedPath : resolveDefaultDeployedPath(),
+			deployedPath,
 			cachePath,
-			sdkPath: typeof options.sdkPath === "string" ? options.sdkPath ? URI.file(options.sdkPath) : resolveDefaultSdkPath() : options.sdkPath ? options.sdkPath : resolveDefaultSdkPath(),
-			configPath: typeof options.configPath === "string" ? options.configPath ? URI.file(options.configPath) : resolveDefaultConfigPath() : options.configPath ? options.configPath : resolveDefaultConfigPath(),
-			logPath: typeof options.logPath === "string" ? options.logPath ? URI.file(options.logPath) : resolveDefaultLogPath() : options.logPath ? options.logPath : resolveDefaultLogPath(),
-			emulatorPath: typeof options.emulatorPath === "string" ? options.emulatorPath ? URI.file(options.emulatorPath) : resolveDefaultEmulatorPath() : options.emulatorPath ? options.emulatorPath : resolveDefaultEmulatorPath(),
+			sdkPath,
+			defaultSdkPath: await fs.isDirectory(resolveDefaultSdkPath()).then((isDirectory) => isDirectory ? resolveDefaultSdkPath() : void 0, () => void 0),
+			configPath,
+			logPath,
+			emulatorPath,
 			adapter
 		};
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arkts/image-manager",
   "type": "module",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "OpenHarmony/HarmonyOS qemu image manager.",
   "author": "Naily Zero <zero@naily.cc> (https://naily.cc)",
   "license": "MIT",