@arkts/image-manager 0.3.1 → 0.3.3

package/dist/index.cjs

@@ -30,6 +30,8 @@ let axios = require("axios");
 axios = __toESM(axios);
 let semver_functions_satisfies = require("semver/functions/satisfies");
 semver_functions_satisfies = __toESM(semver_functions_satisfies);
+let ini = require("ini");
+ini = __toESM(ini);
 let mitt = require("mitt");
 mitt = __toESM(mitt);
 let progress_stream = require("progress-stream");
@@ -38,7 +40,7 @@ let unzipper = require("unzipper");
 unzipper = __toESM(unzipper);
 
 //#region package.json
-var version = "0.3.1";
+var version = "0.3.3";
 
 //#endregion
 //#region src/devices/list.ts
@@ -188,7 +190,18 @@ var DeviceImpl = class {
 	getUuid() {
 		return this.uuid;
 	}
+	cachedList = null;
+	setCachedList(list) {
+		this.cachedList = list;
+		return this;
+	}
+	cachedIni = null;
+	setCachedIni(ini) {
+		this.cachedIni = ini;
+		return this;
+	}
 	buildList() {
+		if (this.cachedList) return this.cachedList;
 		const { path, deployedPath, imageBasePath, configPath, logPath } = this.image.getImageManager().getOptions();
 		const screen = this.getScreen();
 		const list = {
@@ -223,6 +236,7 @@ var DeviceImpl = class {
 		return list;
 	}
 	buildIni(options = {}) {
+		if (this.cachedIni) return this.cachedIni;
 		const listConfig = this.buildList();
 		const screen = this.getScreen();
 		const is2in1Foldable = listConfig.type === "2in1_foldable";
@@ -275,10 +289,20 @@ var DeviceImpl = class {
 		}
 		return ini;
 	}
-	async toIniString() {
+	toIniString() {
 		return `${Object.entries(this.buildIni()).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${value}`).join("\n")}\n`;
 	}
+	buildDeviceIni() {
+		return {
+			"hvd.ini.encoding": "UTF-8",
+			"path": this.buildList().path
+		};
+	}
+	buildDeviceIniString() {
+		return `${Object.entries(this.buildDeviceIni()).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${value}`).join("\n")}\n`;
+	}
 	async deploy() {
+		if (await this.isDeployed()) return;
 		const { fs, path, deployedPath } = this.image.getImageManager().getOptions();
 		if (!fs.existsSync(deployedPath)) fs.mkdirSync(deployedPath, { recursive: true });
 		const listsPath = path.join(deployedPath, "lists.json");
@@ -289,9 +313,10 @@ var DeviceImpl = class {
 		if (!Array.isArray(lists)) throw new DeployError(DeployError.Code.LIST_JSON_NOT_AN_ARRAY, "Lists is not an array");
 		if (lists.find((item) => item.name === listConfig.name)) throw new DeployError(DeployError.Code.DEVICE_ALREADY_DEPLOYED, `Image ${listConfig.name} already deployed in lists.json`);
 		lists.push(listConfig);
-		fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
 		fs.mkdirSync(listConfig.path, { recursive: true });
-		fs.writeFileSync(path.join(listConfig.path, "config.ini"), await this.toIniString());
+		fs.writeFileSync(path.join(listConfig.path, "config.ini"), this.toIniString());
+		fs.writeFileSync(path.join(deployedPath, `${this.options.name}.ini`), this.buildDeviceIniString());
+		fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
 	}
 	async delete() {
 		const { fs, path, deployedPath } = this.image.getImageManager().getOptions();
@@ -303,6 +328,7 @@ var DeviceImpl = class {
 		lists.splice(index, 1);
 		fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
 		fs.rmSync(path.resolve(this.buildList().path), { recursive: true });
+		fs.rmSync(path.resolve(deployedPath, `${this.options.name}.ini`));
 	}
 	async isDeployed() {
 		const { fs, path, deployedPath } = this.image.getImageManager().getOptions();
@@ -655,6 +681,8 @@ var LocalImageImpl = class extends ImageBase {
 		const devices = [];
 		for (const listsJsonItem of listsJson) {
 			if (path.resolve(imageBasePath, listsJsonItem.imageDir) !== this.getFsPath()) continue;
+			const iniFilePath = path.resolve(listsJsonItem.path, "config.ini");
+			if (!fs.existsSync(iniFilePath) || !fs.statSync(iniFilePath).isFile()) continue;
 			const device = this.createDevice({
 				name: listsJsonItem.name,
 				cpuNumber: Number(listsJsonItem.cpuNumber),
@@ -662,7 +690,8 @@ var LocalImageImpl = class extends ImageBase {
 				memorySize: Number(listsJsonItem.memoryRamSize),
 				screen: await this.createScreenLike(listsJsonItem)
 			});
-			if (!fs.existsSync(device.buildList().path) || !fs.statSync(device.buildList().path).isDirectory()) continue;
+			device.setUuid(listsJsonItem.uuid).setCachedList(listsJsonItem).setCachedIni(ini.default.parse(fs.readFileSync(iniFilePath, "utf-8")));
+			if (!fs.existsSync(listsJsonItem.path) || !fs.statSync(listsJsonItem.path).isDirectory()) continue;
 			devices.push(device);
 		}
 		return devices;

package/dist/index.d.cts

@@ -498,7 +498,7 @@ interface Device {
   getUuid(): Device.UUID;
   buildList(): FullDeployedImageOptions;
   buildIni(): Record<string, string | undefined>;
-  toIniString(): Promise<string>;
+  toIniString(): string;
   deploy(): Promise<void>;
   delete(): Promise<void>;
   isDeployed(): Promise<boolean>;

package/dist/index.d.mts

@@ -498,7 +498,7 @@ interface Device {
   getUuid(): Device.UUID;
   buildList(): FullDeployedImageOptions;
   buildIni(): Record<string, string | undefined>;
-  toIniString(): Promise<string>;
+  toIniString(): string;
   deploy(): Promise<void>;
   delete(): Promise<void>;
   isDeployed(): Promise<boolean>;

package/dist/index.mjs

@@ -1,11 +1,12 @@
 import axios, { AxiosError } from "axios";
 import satisfies from "semver/functions/satisfies";
+import INI from "ini";
 import mitt from "mitt";
 import progress from "progress-stream";
 import unzipper from "unzipper";
 
 //#region package.json
-var version = "0.3.1";
+var version = "0.3.3";
 
 //#endregion
 //#region src/devices/list.ts
@@ -155,7 +156,18 @@ var DeviceImpl = class {
 	getUuid() {
 		return this.uuid;
 	}
+	cachedList = null;
+	setCachedList(list) {
+		this.cachedList = list;
+		return this;
+	}
+	cachedIni = null;
+	setCachedIni(ini) {
+		this.cachedIni = ini;
+		return this;
+	}
 	buildList() {
+		if (this.cachedList) return this.cachedList;
 		const { path, deployedPath, imageBasePath, configPath, logPath } = this.image.getImageManager().getOptions();
 		const screen = this.getScreen();
 		const list = {
@@ -190,6 +202,7 @@ var DeviceImpl = class {
 		return list;
 	}
 	buildIni(options = {}) {
+		if (this.cachedIni) return this.cachedIni;
 		const listConfig = this.buildList();
 		const screen = this.getScreen();
 		const is2in1Foldable = listConfig.type === "2in1_foldable";
@@ -242,10 +255,20 @@ var DeviceImpl = class {
 		}
 		return ini;
 	}
-	async toIniString() {
+	toIniString() {
 		return `${Object.entries(this.buildIni()).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${value}`).join("\n")}\n`;
 	}
+	buildDeviceIni() {
+		return {
+			"hvd.ini.encoding": "UTF-8",
+			"path": this.buildList().path
+		};
+	}
+	buildDeviceIniString() {
+		return `${Object.entries(this.buildDeviceIni()).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${value}`).join("\n")}\n`;
+	}
 	async deploy() {
+		if (await this.isDeployed()) return;
 		const { fs, path, deployedPath } = this.image.getImageManager().getOptions();
 		if (!fs.existsSync(deployedPath)) fs.mkdirSync(deployedPath, { recursive: true });
 		const listsPath = path.join(deployedPath, "lists.json");
@@ -256,9 +279,10 @@ var DeviceImpl = class {
 		if (!Array.isArray(lists)) throw new DeployError(DeployError.Code.LIST_JSON_NOT_AN_ARRAY, "Lists is not an array");
 		if (lists.find((item) => item.name === listConfig.name)) throw new DeployError(DeployError.Code.DEVICE_ALREADY_DEPLOYED, `Image ${listConfig.name} already deployed in lists.json`);
 		lists.push(listConfig);
-		fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
 		fs.mkdirSync(listConfig.path, { recursive: true });
-		fs.writeFileSync(path.join(listConfig.path, "config.ini"), await this.toIniString());
+		fs.writeFileSync(path.join(listConfig.path, "config.ini"), this.toIniString());
+		fs.writeFileSync(path.join(deployedPath, `${this.options.name}.ini`), this.buildDeviceIniString());
+		fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
 	}
 	async delete() {
 		const { fs, path, deployedPath } = this.image.getImageManager().getOptions();
@@ -270,6 +294,7 @@ var DeviceImpl = class {
 		lists.splice(index, 1);
 		fs.writeFileSync(listsPath, JSON.stringify(lists, null, 2));
 		fs.rmSync(path.resolve(this.buildList().path), { recursive: true });
+		fs.rmSync(path.resolve(deployedPath, `${this.options.name}.ini`));
 	}
 	async isDeployed() {
 		const { fs, path, deployedPath } = this.image.getImageManager().getOptions();
@@ -622,6 +647,8 @@ var LocalImageImpl = class extends ImageBase {
 		const devices = [];
 		for (const listsJsonItem of listsJson) {
 			if (path.resolve(imageBasePath, listsJsonItem.imageDir) !== this.getFsPath()) continue;
+			const iniFilePath = path.resolve(listsJsonItem.path, "config.ini");
+			if (!fs.existsSync(iniFilePath) || !fs.statSync(iniFilePath).isFile()) continue;
 			const device = this.createDevice({
 				name: listsJsonItem.name,
 				cpuNumber: Number(listsJsonItem.cpuNumber),
@@ -629,7 +656,8 @@ var LocalImageImpl = class extends ImageBase {
 				memorySize: Number(listsJsonItem.memoryRamSize),
 				screen: await this.createScreenLike(listsJsonItem)
 			});
-			if (!fs.existsSync(device.buildList().path) || !fs.statSync(device.buildList().path).isDirectory()) continue;
+			device.setUuid(listsJsonItem.uuid).setCachedList(listsJsonItem).setCachedIni(INI.parse(fs.readFileSync(iniFilePath, "utf-8")));
+			if (!fs.existsSync(listsJsonItem.path) || !fs.statSync(listsJsonItem.path).isDirectory()) continue;
 			devices.push(device);
 		}
 		return devices;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arkts/image-manager",
   "type": "module",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "OpenHarmony/HarmonyOS qemu image manager.",
   "author": "Naily Zero <zero@naily.cc> (https://naily.cc)",
   "license": "MIT",
@@ -43,6 +43,7 @@
     "@types/progress-stream": "^2.0.5",
     "@types/unzipper": "^0.10.11",
     "axios": "^1.13.4",
+    "ini": "^6.0.0",
     "mitt": "^3.0.1",
     "progress-stream": "^2.0.0",
     "semver": "^7.7.4",
@@ -51,6 +52,7 @@
   "devDependencies": {
     "@antfu/eslint-config": "^7.2.0",
     "@changesets/cli": "^2.29.8",
+    "@types/ini": "^4.1.1",
     "@types/node": "^25.2.0",
     "@types/semver": "^7.7.1",
     "@vitest/coverage-v8": "4.0.18",