@arkts/image-manager 0.2.1 → 0.2.3

package/dist/default-product-config.cjs

@@ -9,7 +9,8 @@ var default_product_config_default = {
 			screenDiagonal: "6.84",
 			screenDensity: "560",
 			oneCutoutPath: "M517 45 L802 45 v 103 h -285 Z",
-			visible: true
+			visible: true,
+			devModel: "PHEMU-FD00"
 		},
 		{
 			name: "nova 15",
@@ -18,7 +19,8 @@ var default_product_config_default = {
 			screenDiagonal: "6.7",
 			screenDensity: "480",
 			oneCutoutPath: "M504 16 L580 16 v 76 h -76 Z",
-			visible: true
+			visible: true,
+			devModel: "PHEMU-FD00"
 		},
 		{
 			name: "Mate 80 Pro Max、Mate 80 RS",

package/dist/default-product-config.mjs

@@ -8,7 +8,8 @@ var default_product_config_default = {
 			screenDiagonal: "6.84",
 			screenDensity: "560",
 			oneCutoutPath: "M517 45 L802 45 v 103 h -285 Z",
-			visible: true
+			visible: true,
+			devModel: "PHEMU-FD00"
 		},
 		{
 			name: "nova 15",
@@ -17,7 +18,8 @@ var default_product_config_default = {
 			screenDiagonal: "6.7",
 			screenDensity: "480",
 			oneCutoutPath: "M504 16 L580 16 v 76 h -76 Z",
-			visible: true
+			visible: true,
+			devModel: "PHEMU-FD00"
 		},
 		{
 			name: "Mate 80 Pro Max、Mate 80 RS",

package/dist/index.cjs

@@ -36,7 +36,7 @@ let unzipper = require("unzipper");
 unzipper = __toESM(unzipper);
 
 //#region package.json
-var version = "0.2.1";
+var version = "0.2.3";
 
 //#endregion
 //#region src/deployer/list.ts
@@ -51,6 +51,27 @@ let DevModel = /* @__PURE__ */ function(DevModel) {
 	return DevModel;
 }({});
 
+//#endregion
+//#region src/errors/deploy-error.ts
+var DeployError = class extends Error {
+	constructor(code, message, cause) {
+		super(message, { cause });
+		this.code = code;
+		this.message = message;
+		this.cause = cause;
+	}
+};
+(function(_DeployError) {
+	_DeployError.Code = /* @__PURE__ */ function(Code) {
+		Code["DEVICE_ALREADY_DEPLOYED"] = "DEVICE_ALREADY_DEPLOYED";
+		Code["LIST_JSON_NOT_AN_ARRAY"] = "LIST_JSON_NOT_AN_ARRAY";
+		Code["CATCHED_ERROR"] = "CATCHED_ERROR";
+		Code["MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO"] = "MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO";
+		Code["SYMLINK_SDK_PATH_EXISTS"] = "SYMLINK_SDK_PATH_EXISTS";
+		return Code;
+	}({});
+})(DeployError || (DeployError = {}));
+
 //#endregion
 //#region src/errors/request-url-error.ts
 var RequestUrlError = class extends Error {
@@ -207,23 +228,36 @@ var ImageDeployerImpl = class {
 	async toIniString() {
 		return `${Object.entries(await this.buildIni()).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${value}`).join("\n")}\n`;
 	}
-	writeLists(config) {
+	async writeToListWithCheck(config) {
 		const fs = this.image.getImageManager().getOptions().fs;
 		const listsPath = this.image.getImageManager().getOptions().path.resolve(this.image.getImageManager().getOptions().deployedPath, "lists.json");
-		if (!fs.existsSync(listsPath)) fs.writeFileSync(listsPath, JSON.stringify([config], null, 2));
-		else {
-			const lists = JSON.parse(fs.readFileSync(listsPath, "utf-8")) ?? [];
-			if (!Array.isArray(lists)) return /* @__PURE__ */ new Error("Lists is not an array");
-			if (lists.find((item) => item.name === config.name)) return;
-			lists.push(config);
-			fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
+		try {
+			if (!fs.existsSync(listsPath)) fs.writeFileSync(listsPath, JSON.stringify([config], null, 2));
+			else {
+				const lists = JSON.parse(fs.readFileSync(listsPath, "utf-8")) ?? [];
+				if (!Array.isArray(lists)) return new DeployError(DeployError.Code.LIST_JSON_NOT_AN_ARRAY, "Lists is not an array");
+				if (lists.find((item) => item.name === config.name)) return;
+				lists.push(config);
+				fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
+			}
+		} catch (err) {
+			return err instanceof Error ? new DeployError(DeployError.Code.CATCHED_ERROR, String(err)) : new DeployError(DeployError.Code.CATCHED_ERROR, String(err));
 		}
+		return new Promise((resolve) => {
+			const timer = setTimeout(() => {
+				const content = JSON.parse(fs.readFileSync(listsPath, "utf-8")) ?? [];
+				if (!Array.isArray(content)) resolve(new DeployError(DeployError.Code.LIST_JSON_NOT_AN_ARRAY, "List rechecker is not an array!"));
+				else if (!content.find((item) => item.name === config.name)) resolve(new DeployError(DeployError.Code.MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO, `Device ${config.name} not found in lists.json! Maybe not deployed yet?`));
+				else resolve();
+				clearTimeout(timer);
+			}, 1e3);
+		});
 	}
 	async deploy(symlinkImage = true) {
 		const { fs, path, imageBasePath, sdkPath } = this.image.getImageManager().getOptions();
 		const config = await this.buildList();
-		if (fs.existsSync(config.path)) return /* @__PURE__ */ new Error(`Image ${config.name} already deployed`);
-		const error = this.writeLists(config);
+		if (fs.existsSync(config.path)) return new DeployError(DeployError.Code.DEVICE_ALREADY_DEPLOYED, `Image ${config.name} already deployed`);
+		const error = await this.writeToListWithCheck(config);
 		if (error) return error;
 		fs.mkdirSync(config.path, { recursive: true });
 		fs.writeFileSync(path.join(config.path, "config.ini"), await this.toIniString());
@@ -231,7 +265,7 @@ var ImageDeployerImpl = class {
 		if (!fs.existsSync(path.dirname(symlinkSdkPath))) fs.mkdirSync(path.dirname(symlinkSdkPath), { recursive: true });
 		try {
 			if (fs.lstatSync(symlinkSdkPath).isSymbolicLink()) fs.unlinkSync(symlinkSdkPath);
-			else return void 0;
+			else return new DeployError(DeployError.Code.SYMLINK_SDK_PATH_EXISTS, "Symlink SDK path already exists");
 		} catch {}
 		fs.symlinkSync(sdkPath, symlinkSdkPath, "dir");
 		const systemImageDir = path.join(imageBasePath, "system-image");
@@ -241,7 +275,7 @@ var ImageDeployerImpl = class {
 				const target = path.relative(config.path, systemImageDir);
 				fs.symlinkSync(target, linkPath);
 			} catch (err) {
-				return err instanceof Error ? err : new Error(String(err));
+				return err instanceof Error ? new DeployError(DeployError.Code.CATCHED_ERROR, String(err)) : new DeployError(DeployError.Code.CATCHED_ERROR, String(err));
 			}
 		}
 	}
@@ -718,6 +752,12 @@ function createDeployedImageConfig(productConfigItem) {
 }
 
 //#endregion
+Object.defineProperty(exports, 'DeployError', {
+  enumerable: true,
+  get: function () {
+    return DeployError;
+  }
+});
 exports.DevModel = DevModel;
 exports.RequestUrlError = RequestUrlError;
 exports.createDeployedImageConfig = createDeployedImageConfig;

package/dist/index.d.cts

@@ -190,6 +190,23 @@ interface ImageManager {
 }
 declare function createImageManager(options?: ImageManagerOptions): Promise<ImageManager>;
 //#endregion
+//#region src/errors/deploy-error.d.ts
+declare class DeployError extends Error {
+  readonly code: DeployError.Code;
+  readonly message: string;
+  readonly cause?: Error;
+  constructor(code: DeployError.Code, message: string, cause?: Error);
+}
+declare namespace DeployError {
+  enum Code {
+    DEVICE_ALREADY_DEPLOYED = "DEVICE_ALREADY_DEPLOYED",
+    LIST_JSON_NOT_AN_ARRAY = "LIST_JSON_NOT_AN_ARRAY",
+    CATCHED_ERROR = "CATCHED_ERROR",
+    MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO = "MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO",
+    SYMLINK_SDK_PATH_EXISTS = "SYMLINK_SDK_PATH_EXISTS"
+  }
+}
+//#endregion
 //#region src/errors/request-url-error.d.ts
 declare class RequestUrlError extends Error {
   readonly message: string;
@@ -287,4 +304,4 @@ interface Device {
   delete(): Promise<void | Error>;
 }
 //#endregion
-export { Arch, DeployedDevModel, DeployedImageConfig, DeployedImageConfigWithProductName, DeployedImageOptions, DevModel, Device, DeviceType, FullDeployedImageOptions, Image, type ImageManager, type ImageManagerOptions, ImageType, LocalImage, OS, PascalCaseDeviceType, type ProductConfig, type ProductConfigItem, ProductNameable, RemoteImage, RequestUrlError, SnakecaseDeviceType, Stringifiable, createDeployedImageConfig, createImageManager, version };
+export { Arch, DeployError, DeployedDevModel, DeployedImageConfig, DeployedImageConfigWithProductName, DeployedImageOptions, DevModel, Device, DeviceType, FullDeployedImageOptions, Image, type ImageManager, type ImageManagerOptions, ImageType, LocalImage, OS, PascalCaseDeviceType, type ProductConfig, type ProductConfigItem, ProductNameable, RemoteImage, RequestUrlError, SnakecaseDeviceType, Stringifiable, createDeployedImageConfig, createImageManager, version };

package/dist/index.d.mts

@@ -190,6 +190,23 @@ interface ImageManager {
 }
 declare function createImageManager(options?: ImageManagerOptions): Promise<ImageManager>;
 //#endregion
+//#region src/errors/deploy-error.d.ts
+declare class DeployError extends Error {
+  readonly code: DeployError.Code;
+  readonly message: string;
+  readonly cause?: Error;
+  constructor(code: DeployError.Code, message: string, cause?: Error);
+}
+declare namespace DeployError {
+  enum Code {
+    DEVICE_ALREADY_DEPLOYED = "DEVICE_ALREADY_DEPLOYED",
+    LIST_JSON_NOT_AN_ARRAY = "LIST_JSON_NOT_AN_ARRAY",
+    CATCHED_ERROR = "CATCHED_ERROR",
+    MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO = "MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO",
+    SYMLINK_SDK_PATH_EXISTS = "SYMLINK_SDK_PATH_EXISTS"
+  }
+}
+//#endregion
 //#region src/errors/request-url-error.d.ts
 declare class RequestUrlError extends Error {
   readonly message: string;
@@ -287,4 +304,4 @@ interface Device {
   delete(): Promise<void | Error>;
 }
 //#endregion
-export { Arch, DeployedDevModel, DeployedImageConfig, DeployedImageConfigWithProductName, DeployedImageOptions, DevModel, type Device, DeviceType, FullDeployedImageOptions, type Image, type ImageManager, type ImageManagerOptions, type ImageType, type LocalImage, OS, PascalCaseDeviceType, type ProductConfig, type ProductConfigItem, ProductNameable, type RemoteImage, RequestUrlError, SnakecaseDeviceType, Stringifiable, createDeployedImageConfig, createImageManager, version };
+export { Arch, DeployError, DeployedDevModel, DeployedImageConfig, DeployedImageConfigWithProductName, DeployedImageOptions, DevModel, type Device, DeviceType, FullDeployedImageOptions, type Image, type ImageManager, type ImageManagerOptions, type ImageType, type LocalImage, OS, PascalCaseDeviceType, type ProductConfig, type ProductConfigItem, ProductNameable, type RemoteImage, RequestUrlError, SnakecaseDeviceType, Stringifiable, createDeployedImageConfig, createImageManager, version };

package/dist/index.mjs

@@ -4,7 +4,7 @@ import progress from "progress-stream";
 import unzipper from "unzipper";
 
 //#region package.json
-var version = "0.2.1";
+var version = "0.2.3";
 
 //#endregion
 //#region src/deployer/list.ts
@@ -19,6 +19,27 @@ let DevModel = /* @__PURE__ */ function(DevModel) {
 	return DevModel;
 }({});
 
+//#endregion
+//#region src/errors/deploy-error.ts
+var DeployError = class extends Error {
+	constructor(code, message, cause) {
+		super(message, { cause });
+		this.code = code;
+		this.message = message;
+		this.cause = cause;
+	}
+};
+(function(_DeployError) {
+	_DeployError.Code = /* @__PURE__ */ function(Code) {
+		Code["DEVICE_ALREADY_DEPLOYED"] = "DEVICE_ALREADY_DEPLOYED";
+		Code["LIST_JSON_NOT_AN_ARRAY"] = "LIST_JSON_NOT_AN_ARRAY";
+		Code["CATCHED_ERROR"] = "CATCHED_ERROR";
+		Code["MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO"] = "MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO";
+		Code["SYMLINK_SDK_PATH_EXISTS"] = "SYMLINK_SDK_PATH_EXISTS";
+		return Code;
+	}({});
+})(DeployError || (DeployError = {}));
+
 //#endregion
 //#region src/errors/request-url-error.ts
 var RequestUrlError = class extends Error {
@@ -175,23 +196,36 @@ var ImageDeployerImpl = class {
 	async toIniString() {
 		return `${Object.entries(await this.buildIni()).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${value}`).join("\n")}\n`;
 	}
-	writeLists(config) {
+	async writeToListWithCheck(config) {
 		const fs = this.image.getImageManager().getOptions().fs;
 		const listsPath = this.image.getImageManager().getOptions().path.resolve(this.image.getImageManager().getOptions().deployedPath, "lists.json");
-		if (!fs.existsSync(listsPath)) fs.writeFileSync(listsPath, JSON.stringify([config], null, 2));
-		else {
-			const lists = JSON.parse(fs.readFileSync(listsPath, "utf-8")) ?? [];
-			if (!Array.isArray(lists)) return /* @__PURE__ */ new Error("Lists is not an array");
-			if (lists.find((item) => item.name === config.name)) return;
-			lists.push(config);
-			fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
+		try {
+			if (!fs.existsSync(listsPath)) fs.writeFileSync(listsPath, JSON.stringify([config], null, 2));
+			else {
+				const lists = JSON.parse(fs.readFileSync(listsPath, "utf-8")) ?? [];
+				if (!Array.isArray(lists)) return new DeployError(DeployError.Code.LIST_JSON_NOT_AN_ARRAY, "Lists is not an array");
+				if (lists.find((item) => item.name === config.name)) return;
+				lists.push(config);
+				fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
+			}
+		} catch (err) {
+			return err instanceof Error ? new DeployError(DeployError.Code.CATCHED_ERROR, String(err)) : new DeployError(DeployError.Code.CATCHED_ERROR, String(err));
 		}
+		return new Promise((resolve) => {
+			const timer = setTimeout(() => {
+				const content = JSON.parse(fs.readFileSync(listsPath, "utf-8")) ?? [];
+				if (!Array.isArray(content)) resolve(new DeployError(DeployError.Code.LIST_JSON_NOT_AN_ARRAY, "List rechecker is not an array!"));
+				else if (!content.find((item) => item.name === config.name)) resolve(new DeployError(DeployError.Code.MAYBE_OPENED_DEVICE_MANAGER_IN_DEVECO_STUDIO, `Device ${config.name} not found in lists.json! Maybe not deployed yet?`));
+				else resolve();
+				clearTimeout(timer);
+			}, 1e3);
+		});
 	}
 	async deploy(symlinkImage = true) {
 		const { fs, path, imageBasePath, sdkPath } = this.image.getImageManager().getOptions();
 		const config = await this.buildList();
-		if (fs.existsSync(config.path)) return /* @__PURE__ */ new Error(`Image ${config.name} already deployed`);
-		const error = this.writeLists(config);
+		if (fs.existsSync(config.path)) return new DeployError(DeployError.Code.DEVICE_ALREADY_DEPLOYED, `Image ${config.name} already deployed`);
+		const error = await this.writeToListWithCheck(config);
 		if (error) return error;
 		fs.mkdirSync(config.path, { recursive: true });
 		fs.writeFileSync(path.join(config.path, "config.ini"), await this.toIniString());
@@ -199,7 +233,7 @@ var ImageDeployerImpl = class {
 		if (!fs.existsSync(path.dirname(symlinkSdkPath))) fs.mkdirSync(path.dirname(symlinkSdkPath), { recursive: true });
 		try {
 			if (fs.lstatSync(symlinkSdkPath).isSymbolicLink()) fs.unlinkSync(symlinkSdkPath);
-			else return void 0;
+			else return new DeployError(DeployError.Code.SYMLINK_SDK_PATH_EXISTS, "Symlink SDK path already exists");
 		} catch {}
 		fs.symlinkSync(sdkPath, symlinkSdkPath, "dir");
 		const systemImageDir = path.join(imageBasePath, "system-image");
@@ -209,7 +243,7 @@ var ImageDeployerImpl = class {
 				const target = path.relative(config.path, systemImageDir);
 				fs.symlinkSync(target, linkPath);
 			} catch (err) {
-				return err instanceof Error ? err : new Error(String(err));
+				return err instanceof Error ? new DeployError(DeployError.Code.CATCHED_ERROR, String(err)) : new DeployError(DeployError.Code.CATCHED_ERROR, String(err));
 			}
 		}
 	}
@@ -686,4 +720,4 @@ function createDeployedImageConfig(productConfigItem) {
 }
 
 //#endregion
-export { DevModel, RequestUrlError, createDeployedImageConfig, createImageManager, version };
+export { DeployError, DevModel, RequestUrlError, createDeployedImageConfig, createImageManager, version };

package/package.json

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