@aiot-toolkit/emulator 2.0.2-dev.8 → 2.0.3-beta.1

package/README.md

@@ -1,2 +1,15 @@
+## emulator
 
-emulator tool
+QEMU模拟器
+
+模拟器的介绍可参考[开发帮助文档](https://xiaomi.f.mioffice.cn/docx/doxk4Rk6x67GanHlzQ8bEOrxtEe)里的「模拟器」章节
+
+## 目录结构
+
+| 目录     | 描述                                                                            |
+| -------- | ------------------------------------------------------------------------------- |
+| avd   |   模拟器的AVD，配置统一放置$HOME/.android/avd目录下         |
+| instance | 模拟器实例，不同的Vela镜像版本会使用不同的instance，通过findInstance确定                 |
+| static   | 创建AVD时需要用到的静态资源，常量配置文件                                           |
+| typing    | 接口定义                                                       |
+| utils   | 工具函数                                                       |

package/lib/avd/index.d.ts

@@ -3,10 +3,26 @@ declare class VelaAvdCls {
     private avdHome;
     private sdkHome;
     constructor(avdResourcePaths: IAvdResourcePaths);
+    /**
+     * 创建Vela端的AVD，统一保存在.android目录下
+     * 1. 创建.android/advancedFeatures.ini文件
+     * 2. 创建.android/${avdName}.ini文件
+     * 3. 创建.android/${avdName}.avd/config.ini文件
+     * @param avdParams AVD参数，宽高、绑定的镜像路径等
+     * @returns
+     */
     createVelaAvd(avdParams: IAvdParams): boolean;
+    /** 根据AVD名字获取模拟器的详细信息 */
     getVelaAvdInfo(avdName: string): IAvdParams;
+    /** 根据名字删除AVD */
     deleteVelaAvd(avdName: string): boolean;
+    /** 获取已经创建的模拟器列表 */
     getVelaAvdList(): IAvdParams[];
+    /** 获取模拟器皮肤列表 */
     getVelaSkinList(): string[];
+    /** 自定义模拟器的镜像目录 */
+    customImageDir(avdName: string, target: string): void;
+    /** 重置自定义的镜像目录  */
+    resetImageDir(avdName: string): void;
 }
 export default VelaAvdCls;

package/lib/avd/index.js

@@ -5,15 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const constants_1 = require("../static/constants");
+const ini_1 = require("ini");
+const constants_1 = require("../emulatorutil/constants");
 const Avd_1 = require("../typing/Avd");
 const EAvdParamsToIni = {
-    'arm': {
-        abiType: 'armeabi-v7a',
+    arm: {
+        abiType: 'armeabi-v7a'
     },
-    'arm64': {
-        abiType: 'arm64-v8a',
+    arm64: {
+        abiType: 'arm64-v8a'
     }
 };
 class VelaAvdCls {
@@ -25,7 +27,21 @@ class VelaAvdCls {
             fs_1.default.mkdirSync(this.avdHome, { recursive: true });
         }
     }
+    /**
+     * 创建Vela端的AVD，统一保存在.android目录下
+     * 1. 创建.android/advancedFeatures.ini文件
+     * 2. 创建.android/${avdName}.ini文件
+     * 3. 创建.android/${avdName}.avd/config.ini文件
+     * @param avdParams AVD参数，宽高、绑定的镜像路径等
+     * @returns
+     */
     createVelaAvd(avdParams) {
+        // 在.android下创建advancedFeatures.ini文件
+        const advancedFeaturesIni = path_1.default.resolve(os_1.default.homedir(), '.android/advancedFeatures.ini');
+        if (!fs_1.default.existsSync(advancedFeaturesIni)) {
+            const iniSourcePath = path_1.default.join(__dirname, '../static/advancedFeatures.ini');
+            fs_1.default.copyFileSync(iniSourcePath, advancedFeaturesIni);
+        }
         const { avdName, avdArch, avdWidth, avdHeight, avdSkin, avdImagePath = constants_1.defaultImageHome } = avdParams;
         const avdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
         const avdIni = path_1.default.resolve(this.avdHome, `${avdName}.ini`);
@@ -57,18 +73,14 @@ class VelaAvdCls {
             // 写入Vela_Virtual_Device.ini文件
             fs_1.default.writeFileSync(avdIni, nuttxAvdIniContent);
             // 写入Vela_Virtual_Device.avd/config.ini文件
-            const fWrite = fs_1.default.createWriteStream(avdConfigIni);
-            for (const item in configIniJson) {
-                const line = `${item} = ${configIniJson[item]}\n`;
-                fWrite.write(line);
-            }
-            fWrite.close();
+            fs_1.default.writeFileSync(avdConfigIni, (0, ini_1.stringify)(configIniJson));
             return true;
         }
         catch (e) {
-            throw (`createVelaAvd: ${e.message}`);
+            throw `createVelaAvd: ${e.message}`;
         }
     }
+    /** 根据AVD名字获取模拟器的详细信息 */
     getVelaAvdInfo(avdName) {
         const avdInfo = {
             avdName,
@@ -82,22 +94,13 @@ class VelaAvdCls {
         const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
         try {
             const contents = fs_1.default.readFileSync(configIni, 'utf-8');
-            // 这里需要使用惰性匹配
-            const archRegex = /hw.cpu.arch = ([\d\D]+?)\n/;
-            const archMatcher = contents.match(archRegex);
-            const heightRegex = /hw.lcd.height = ([\d\D]+?)\n/;
-            const heightMatcher = contents.match(heightRegex);
-            const widthRegex = /hw.lcd.width = ([\d\D]+?)\n/;
-            const widthMatcher = contents.match(widthRegex);
-            const skinRegex = /skin.name = ([\d\D]+?)\n/;
-            const skinMatcher = contents.match(skinRegex);
-            const imagePathRegex = /image.sysdir.1 = ([\d\D]+?)\n/;
-            const imagePathMather = contents.match(imagePathRegex);
-            archMatcher && (avdInfo.avdArch = archMatcher[1]);
-            heightMatcher && (avdInfo.avdHeight = heightMatcher[1]);
-            widthMatcher && (avdInfo.avdWidth = widthMatcher[1]);
-            skinMatcher && (avdInfo.avdSkin = skinMatcher[1]);
-            imagePathMather && (avdInfo.avdImagePath = imagePathMather[1]);
+            const config = (0, ini_1.parse)(contents);
+            avdInfo.avdArch = config['hw.cpu.arch'];
+            avdInfo.avdHeight = config['hw.lcd.height'];
+            avdInfo.avdWidth = config['hw.lcd.width'];
+            avdInfo.avdSkin = config['skin.name'];
+            avdInfo.avdImagePath = config['image.sysdir.1'];
+            avdInfo.customImagePath = config['image.sysdir.2'];
             return avdInfo;
         }
         catch (err) {
@@ -105,6 +108,7 @@ class VelaAvdCls {
             return avdInfo;
         }
     }
+    /** 根据名字删除AVD */
     deleteVelaAvd(avdName) {
         const avdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
         const avdIni = path_1.default.resolve(this.avdHome, `${avdName}.ini`);
@@ -117,6 +121,7 @@ class VelaAvdCls {
             return false;
         }
     }
+    /** 获取已经创建的模拟器列表 */
     getVelaAvdList() {
         const avdList = [];
         const files = fs_1.default.readdirSync(this.avdHome);
@@ -131,6 +136,7 @@ class VelaAvdCls {
         }
         return avdList;
     }
+    /** 获取模拟器皮肤列表 */
     getVelaSkinList() {
         try {
             const skinList = [];
@@ -145,5 +151,23 @@ class VelaAvdCls {
             return [];
         }
     }
+    /** 自定义模拟器的镜像目录 */
+    customImageDir(avdName, target) {
+        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
+        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
+        const contents = fs_1.default.readFileSync(configIni, 'utf-8');
+        const config = (0, ini_1.parse)(contents);
+        config['image.sysdir.2'] = target;
+        fs_1.default.writeFileSync(configIni, (0, ini_1.stringify)(config));
+    }
+    /** 重置自定义的镜像目录  */
+    resetImageDir(avdName) {
+        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
+        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
+        const contents = fs_1.default.readFileSync(configIni, 'utf-8');
+        const config = (0, ini_1.parse)(contents);
+        delete config['image.sysdir.2'];
+        fs_1.default.writeFileSync(configIni, (0, ini_1.stringify)(config));
+    }
 }
 exports.default = VelaAvdCls;

package/lib/emulatorutil/EmulatorCmd.d.ts

@@ -0,0 +1,9 @@
+import { IStartOptions } from '../typing/Instance';
+declare class EmulatorCmd {
+    static startOptions: IStartOptions | undefined;
+    static createMiwerCmd(options: IStartOptions, sdkHome: string, avdHome: string): string | undefined;
+    static createDevCmd(options: IStartOptions, sdkHome: string, avdHome: string): string | undefined;
+    static createPreCmd(options: IStartOptions, sdkHome: string, avdHome: string): string[] | undefined;
+    static getEmulatorBinPath(sdkHome: string): string;
+}
+export default EmulatorCmd;

package/lib/emulatorutil/EmulatorCmd.js

@@ -0,0 +1,226 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const avd_1 = __importDefault(require("../avd"));
+const utils_1 = require("../utils");
+const os_1 = __importDefault(require("os"));
+const dayjs_1 = __importDefault(require("dayjs"));
+const constants_1 = require("./constants");
+class EmulatorCmd {
+    static createMiwerCmd(options, sdkHome, avdHome) {
+        var _a;
+        this.startOptions = options;
+        const { avdName, devtool } = options;
+        // 获取emulator bin的绝对路径
+        const emulatorBin = this.getEmulatorBinPath(sdkHome);
+        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+        // 获取vela镜像的绝对路径
+        const velaAvdCls = new avd_1.default({
+            sdkHome: sdkHome,
+            avdHome: avdHome
+        });
+        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
+        const { avdArch, avdImagePath, customImagePath } = avdInfo;
+        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
+        if (!avdImagePath) {
+            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+            return undefined;
+        }
+        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
+        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
+        // 端口映射
+        let portMappingStr = ``;
+        if (devtool) {
+            portMappingStr += `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
+        }
+        // 设备挂载节点
+        const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.bin'); // 只读
+        const dataImageBin = path_1.default.resolve(avdImagePath, 'vela_data.bin'); // 可读可写
+        const coreBin = path_1.default.resolve(avdImagePath, 'coredump.core'); // 只读
+        // 复制可写文件到AVD目录下（多模拟器实例时需要）
+        const dataImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'vela_data.bin');
+        if (!fs_extra_1.default.existsSync(dataImageBinInAvd)) {
+            // vela_data.bin不存在时直接copy
+            fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+        }
+        else {
+            // vela_data.bin存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+            const statsInAvd = fs_extra_1.default.statSync(dataImageBinInAvd);
+            const stats = fs_extra_1.default.statSync(dataImageBin);
+            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
+                fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+            }
+        }
+        // 挂载节点配置，只读文件加入read-only标识
+        const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBin},read-only \
+-device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
+-drive index=1,id=userdata,if=none,format=raw,file=${dataImageBinInAvd} \
+-device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
+-drive index=2,id=vendor,if=none,format=raw,file=${coreBin},read-only \
+-device virtio-blk-device,bus=virtio-mmio-bus.4,drive=vendor \
+-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
+        // grpc配置
+        let windowStr = '';
+        let grpcStr = '';
+        if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.grpcPort) {
+            windowStr = '-qt-hide-window';
+            grpcStr = ` -idle-grpc-timeout 300 -grpc ${this.startOptions.grpcPort}`;
+        }
+        // 启动模拟器的命令和参数
+        const cmd = `${emulatorBin} -nuttx -avd ${avdName} -port ${options.adbPort} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} ${grpcStr} -qemu ${imageMountStr}`;
+        return cmd;
+    }
+    static createDevCmd(options, sdkHome, avdHome) {
+        var _a;
+        this.startOptions = options;
+        const { avdName, devtool } = options;
+        const emulatorBin = this.getEmulatorBinPath(sdkHome);
+        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+        const velaAvdCls = new avd_1.default({
+            sdkHome: sdkHome,
+            avdHome: avdHome
+        });
+        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
+        const { avdArch, avdImagePath, customImagePath } = avdInfo;
+        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
+        if (!avdImagePath) {
+            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+            return undefined;
+        }
+        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
+        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
+        // 端口映射
+        let portMappingStr = ``;
+        if (devtool) {
+            portMappingStr += `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
+        }
+        // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
+        const systemImageBin = path_1.default.join(avdImagePath, 'system.img');
+        const dataImageBin = path_1.default.join(avdImagePath, 'data.img');
+        // 复制可写文件到AVD目录下（多模拟器实例时需要）
+        const dataImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'data.img');
+        if (!fs_extra_1.default.existsSync(dataImageBinInAvd)) {
+            // data.img不存在时直接copy
+            fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+        }
+        else {
+            // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+            const statsInAvd = fs_extra_1.default.statSync(dataImageBinInAvd);
+            const stats = fs_extra_1.default.statSync(dataImageBin);
+            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
+                fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+            }
+        }
+        // 复制可写文件到AVD目录下（多模拟器实例时需要）
+        const systemImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'system.img');
+        if (!fs_extra_1.default.existsSync(systemImageBinInAvd)) {
+            // data.img不存在时直接copy
+            fs_extra_1.default.copyFileSync(systemImageBin, systemImageBinInAvd);
+        }
+        else {
+            // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+            const statsInAvd = fs_extra_1.default.statSync(systemImageBinInAvd);
+            const stats = fs_extra_1.default.statSync(systemImageBin);
+            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
+                fs_extra_1.default.copyFileSync(systemImageBin, systemImageBinInAvd);
+            }
+        }
+        // 复制可写文件到AVD目录下（多模拟器实例时需要）
+        // const nuttxBinInAvd = path.join(this.avdHome, `${avdName}.avd`, 'nuttx')
+        // if (!fs.existsSync(nuttxBinInAvd)) {
+        //   // data.img不存在时直接copy
+        //   fs.copyFileSync(nuttxBinPath, nuttxBinInAvd)
+        // } else {
+        //   // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+        //   const statsInAvd = fs.statSync(nuttxBinInAvd)
+        //   const stats = fs.statSync(nuttxBinPath)
+        //   if (dayjs(stats.mtime).isAfter(statsInAvd.mtime)) {
+        //     fs.copyFileSync(nuttxBinPath, nuttxBinInAvd)
+        //   }
+        // }
+        const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBinInAvd} \
+-device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
+-drive index=1,id=userdata,if=none,format=raw,file=${dataImageBinInAvd} \
+-device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
+-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
+        // grpc配置
+        let windowStr = '';
+        let grpcStr = '';
+        if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.grpcPort) {
+            windowStr = '-qt-hide-window';
+            grpcStr = ` -idle-grpc-timeout 300 -grpc ${this.startOptions.grpcPort}`;
+        }
+        // 启动模拟器的命令和参数
+        const cmd = `${emulatorBin} -nuttx -avd ${avdName} -port ${options.adbPort} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} ${grpcStr} -qemu ${imageMountStr}`;
+        return cmd;
+    }
+    static createPreCmd(options, sdkHome, avdHome) {
+        this.startOptions = options;
+        const { avdName, devtool } = options;
+        // 获取emulator bin的绝对路径
+        const emulatorBin = this.getEmulatorBinPath(sdkHome);
+        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+        // 获取vela镜像的绝对路径
+        const velaAvdCls = new avd_1.default({
+            sdkHome: sdkHome,
+            avdHome: avdHome
+        });
+        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
+        const { avdArch, avdImagePath, customImagePath } = avdInfo;
+        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
+        if (!avdImagePath) {
+            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+            return undefined;
+        }
+        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
+        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
+        // 端口映射，adb端口和debug端口
+        let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
+        if (devtool) {
+            ColorConsole_1.default.log(`### Emulator ### debug port: ${options.debugPort}`);
+            portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
+        }
+        ColorConsole_1.default.log(`### Emulator ### Start qemu with TCP: ${portMappingStr}`);
+        // vnc配置
+        let noWindow = false;
+        let vncStr = '';
+        if (options.grpcPort) {
+            noWindow = true;
+            const portSuffix = options.grpcPort - constants_1.defaultVncPort;
+            vncStr = `-vnc :${portSuffix}`;
+        }
+        // 启动goldfish的命令和参数
+        const spawnArgs = [
+            emulatorBin,
+            '-nuttx',
+            '-avd',
+            avdName,
+            '-avd-arch',
+            avdArch,
+            '-show-kernel',
+            '-kernel',
+            nuttxBinPath,
+            noWindow ? '-no-window' : '',
+            '-qemu',
+            vncStr,
+            '-netdev',
+            portMappingStr,
+            '-device',
+            'virtio-net-device,netdev=u1,bus=virtio-mmio-bus.3'
+        ];
+        return spawnArgs;
+    }
+    static getEmulatorBinPath(sdkHome) {
+        const osPlatform = os_1.default.platform();
+        const arch = (0, utils_1.getSystemArch)();
+        const platform = osPlatform === 'win32' ? 'windows' : osPlatform;
+        const emulatorHome = path_1.default.resolve(sdkHome, 'emulator');
+        return path_1.default.resolve(emulatorHome, `${platform}-${arch}`, 'emulator');
+    }
+}
+exports.default = EmulatorCmd;

package/lib/emulatorutil/EmulatorLog.d.ts

@@ -0,0 +1,11 @@
+declare class EmulatorLog {
+    static emulatorStartedFlag: RegExp;
+    static installFlag: RegExp;
+    static devStartFlag: string;
+    static preDevStartFlag: RegExp;
+    static inStallIsFinshe(msg: string): RegExpMatchArray | null;
+    static rpkIsStart(msg: string): RegExpMatchArray | null;
+    static devIsStart(msg: string): boolean;
+    static preDevIsStart(msg: string): RegExpMatchArray | null;
+}
+export default EmulatorLog;

package/lib/emulatorutil/EmulatorLog.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class EmulatorLog {
+    static inStallIsFinshe(msg) {
+        return msg.match(EmulatorLog.installFlag);
+    }
+    static rpkIsStart(msg) {
+        return msg.match(EmulatorLog.emulatorStartedFlag);
+    }
+    static devIsStart(msg) {
+        return msg.includes(EmulatorLog.devStartFlag);
+    }
+    static preDevIsStart(msg) {
+        return msg.match(EmulatorLog.preDevStartFlag);
+    }
+}
+EmulatorLog.emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
+EmulatorLog.installFlag = /InstallState_Finished|install finished/;
+EmulatorLog.devStartFlag = '(NSH)';
+EmulatorLog.preDevStartFlag = /Server started, listening on: 127.0.0.1:(\d+)/;
+exports.default = EmulatorLog;

package/lib/emulatorutil/constants.d.ts

@@ -0,0 +1,31 @@
+export declare const defaultSDKHome: string;
+export declare const defaultAvdHome: string;
+export declare const defaultImageHome: string;
+export declare const defaultEmulatorHome: string;
+export declare const defaultSkinHome: string;
+export declare const defaultQuickappHome: string;
+export declare const defaultToolsHome: string;
+export declare const defaultVncPort = 5900;
+export declare const defaultAdbPort = 5555;
+export declare const defaultDebugPort = 10055;
+/**
+ * vela-release-4.0 ： vela 4.0 带 miwear
+ * vela-pre-4.0     ： vela 4.0 不带 miwear
+ * vela-dev-0.0.4   ： vela 4.0 dev 分支
+ */
+export declare const VelaImageVersionList: {
+    label: string;
+    value: string;
+    time: string;
+    hide: boolean;
+    icon: null;
+}[];
+export declare const EmulatorEnvVersion: {
+    name: string;
+    emulator: string;
+    qa: string;
+    skins: string;
+    'system-images': string;
+    tools: string;
+    modem_simulator: string;
+};

package/lib/emulatorutil/constants.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmulatorEnvVersion = exports.VelaImageVersionList = exports.defaultDebugPort = exports.defaultAdbPort = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultQuickappHome = exports.defaultSkinHome = exports.defaultEmulatorHome = exports.defaultImageHome = exports.defaultAvdHome = exports.defaultSDKHome = void 0;
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+exports.defaultSDKHome = path_1.default.resolve(os_1.default.homedir(), '.export');
+exports.defaultAvdHome = path_1.default.resolve(os_1.default.homedir(), '.android', 'avd');
+exports.defaultImageHome = path_1.default.resolve(exports.defaultSDKHome, 'system-images/arm');
+exports.defaultEmulatorHome = path_1.default.resolve(exports.defaultSDKHome, 'emulator');
+exports.defaultSkinHome = path_1.default.resolve(exports.defaultSDKHome, 'skins');
+exports.defaultQuickappHome = path_1.default.resolve(exports.defaultSDKHome, 'qa');
+exports.defaultToolsHome = path_1.default.resolve(exports.defaultSDKHome, 'tools');
+exports.defaultVncPort = 5900;
+exports.defaultAdbPort = 5555;
+exports.defaultDebugPort = 10055;
+// 不确定vela镜像的发布策略，暂时需要手动更新此列表
+// 0.0.2和0.0.3版本比较特殊，线上是一个nuttx文件。其他版本都是一个zip包，包含nuttx data.img和vela_source.img
+/**
+ * vela-release-4.0 ： vela 4.0 带 miwear
+ * vela-pre-4.0     ： vela 4.0 不带 miwear
+ * vela-dev-0.0.4   ： vela 4.0 dev 分支
+ */
+exports.VelaImageVersionList = [
+    {
+        label: 'vela-4.0-正式版',
+        value: 'vela-release-4.0',
+        time: '2024-08-12T06:48:00',
+        hide: false,
+        icon: null
+    },
+    {
+        label: 'vela-4.0-测试版',
+        value: 'vela-pre-4.0',
+        time: '2024-08-12T06:48:00',
+        hide: false,
+        icon: null
+    },
+    //  废弃 0.0.2 版本
+    // {
+    //   label: 'vela开发版（dev, 0.0.2）',
+    //   value: 'vela-dev-0.0.2',
+    //   time: '2023-12-04T16:31:00',
+    // },
+    {
+        label: 'vela-dev-开发版',
+        value: 'vela-dev-0.0.4',
+        time: '2024-07-12T11:12:00',
+        hide: true,
+        icon: null
+    }
+];
+exports.EmulatorEnvVersion = {
+    name: '模拟器资源版本管理',
+    emulator: '0.0.4',
+    qa: '0.0.1',
+    skins: '0.0.1',
+    'system-images': exports.VelaImageVersionList[0].value,
+    tools: '0.0.2',
+    modem_simulator: '0.0.1'
+};

package/lib/emulatorutil/index.d.ts

@@ -0,0 +1,3 @@
+import EmulatorLog from './EmulatorLog';
+import EmulatorCmd from './EmulatorCmd';
+export { EmulatorLog, EmulatorCmd };

package/lib/emulatorutil/index.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmulatorCmd = exports.EmulatorLog = void 0;
+const EmulatorLog_1 = __importDefault(require("./EmulatorLog"));
+exports.EmulatorLog = EmulatorLog_1.default;
+const EmulatorCmd_1 = __importDefault(require("./EmulatorCmd"));
+exports.EmulatorCmd = EmulatorCmd_1.default;

package/lib/index.d.ts

@@ -1,5 +1,7 @@
 import { default as VelaAvdCls } from './avd';
+import { getSystemArch } from './utils';
 export * from './instance';
 export * from './typing/Avd';
 export * from './typing/Instance';
-export { VelaAvdCls };
+export * from './emulatorutil/constants';
+export { VelaAvdCls, getSystemArch };

package/lib/index.js

@@ -17,9 +17,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VelaAvdCls = void 0;
+exports.getSystemArch = exports.VelaAvdCls = void 0;
 const avd_1 = __importDefault(require("./avd"));
 Object.defineProperty(exports, "VelaAvdCls", { enumerable: true, get: function () { return avd_1.default; } });
+const utils_1 = require("./utils");
+Object.defineProperty(exports, "getSystemArch", { enumerable: true, get: function () { return utils_1.getSystemArch; } });
 __exportStar(require("./instance"), exports);
 __exportStar(require("./typing/Avd"), exports);
 __exportStar(require("./typing/Instance"), exports);
+__exportStar(require("./emulatorutil/constants"), exports);

package/lib/instance/common.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import IManifest from '@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/interface/IManifest';
 import { ChildProcess } from 'child_process';
 import VelaAvdCls from '../avd';
@@ -7,37 +6,41 @@ import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
  * CommonInstance
  */
 declare class CommonInstance {
+    quickappStartedFlag: RegExp;
     projectPath: string;
     sdkHome: string;
     avdHome: string;
-    adbPort: number;
-    debugPort: number;
     velaAvdCls: VelaAvdCls;
     goldfishProcess: ChildProcess | undefined;
     isFirstStart: boolean;
     startOptions: IStartOptions | undefined;
     projectInfo: IManifest;
     isRpk: boolean;
+    isDistributedApp: boolean;
+    sn?: string;
     constructor(params: INewGoldfishInstanceParams);
     /** 获取模拟器二进制文件所在位置 */
     getEmulatorBinPath(): string;
     /** 在goldfish模拟器中运行快应用 */
     start(options: IStartOptions): Promise<void>;
-    /** 在goldfish中启动快应用 */
-    startupQuickApp(options: IStartOptions): void;
-    /** 启动goldfish模拟器 */
-    startGoldfish(options: IStartOptions): Promise<void>;
-    /** 通过adb连接模拟器 */
-    connectGoldfish(): Promise<boolean>;
-    /** 将打包后的文件推到挂载的快应用目录 */
-    pushRpk(sourceRoot: string): Promise<void>;
+    /**
+     * 判断模拟器是否 ready
+     */
+    isConnected(): Promise<boolean>;
+    /**
+     * 通过adb连接模拟器。
+     * 时间限制为 @param timeout 秒，超时则表示连接失败
+     * @returns
+     */
+    connectGoldfish(timeout?: number): Promise<unknown>;
     /** 杀死进程 */
     killProcess(currProcess?: ChildProcess): void;
     /** 停止模拟器并释放相关资源 */
     stop(): Promise<void>;
     /** 重启模拟器 */
-    restart(): void;
+    restart(): Promise<void>;
     /** 创建server */
     createWebsockeServer(): Promise<void>;
+    connectDevice(): Promise<string | void>;
 }
 export default CommonInstance;