aiot-toolkit 2.0.2-dev.8 → 2.0.2

package/lib/utils/VelaAvdUtils.js

@@ -13,17 +13,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const emulator_1 = require("@aiot-toolkit/emulator");
-const constants_1 = require("@aiot-toolkit/emulator/lib/static/constants");
-const utils_1 = require("@aiot-toolkit/emulator/lib/utils");
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const prompts_1 = require("@inquirer/prompts");
 const adm_zip_1 = __importDefault(require("adm-zip"));
 const axios_1 = __importDefault(require("axios"));
 const cli_progress_1 = __importDefault(require("cli-progress"));
+const dayjs_1 = __importDefault(require("dayjs"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 class VelaAvdUtils {
+    /** 校验AVD名称 */
     static validateAvdName(avdName) {
         if (!avdName) {
             return `Please enter avd name`;
@@ -69,7 +69,7 @@ class VelaAvdUtils {
                 });
             }
             catch (e) {
-                ColorConsole_1.default.throw(`Download ${filename} failed`);
+                shared_utils_1.ColorConsole.throw(`Download ${filename} failed`);
                 reject();
             }
         }));
@@ -104,61 +104,129 @@ class VelaAvdUtils {
     /** 根据host获取模拟器下载地址 */
     static getEmulatorUrl(version = '0.0.1') {
         const systemOs = os_1.default.platform();
-        const hostArch = (0, utils_1.getSystemArch)();
+        const hostArch = (0, emulator_1.getSystemArch)();
         let hostOs = systemOs === 'win32' ? 'windows' : systemOs;
         return `${VelaAvdUtils.emulatorBaseUrl}/v${version}/${hostOs}-${hostArch}.zip`;
     }
-    /** 根据host获取vela镜像下载地址 */
+    /** 获取模拟器平台的名称，darwin-aarch64 linux-aarch64 windows-x86_64等 */
+    static getEmulatorPlatform() {
+        const systemOs = os_1.default.platform();
+        const hostArch = (0, emulator_1.getSystemArch)();
+        const hostOs = systemOs === 'win32' ? 'windows' : systemOs;
+        return `${hostOs}-${hostArch}`;
+    }
+    /** 获取各项模拟器资源的根目录 */
+    static getEmulatorEnvHome(resourceName) {
+        return path_1.default.resolve(VelaAvdUtils.sdkHome, resourceName);
+    }
+    /**
+     * Vela镜像需要更新
+     * @param imageId 镜像id
+     * @returns {boolean}
+     */
+    static velaImageNeedUpdate(imageId) {
+        // 兼容之前的version.json
+        if (typeof imageId !== 'string' || !imageId)
+            return true;
+        let avdImagePath = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', imageId, 'nuttx');
+        if (!fs_extra_1.default.existsSync(avdImagePath)) {
+            return true;
+        }
+        if (VelaAvdUtils.isZipInImageUrl(imageId)) {
+            const stats = fs_extra_1.default.statSync(avdImagePath);
+            const version = emulator_1.VelaImageVersionList.find((item) => item.value === imageId);
+            if (version && (0, dayjs_1.default)(version.time).isAfter(stats.mtime, 'day'))
+                return true;
+        }
+        return false;
+    }
+    /**
+     * Vela镜像是否为zip包（是否为0.0.2版本）
+     * 只有Vela开发版（dev, 0.0.2）这个版本的镜像不是zip包
+     * @param velaImage
+     * @returns
+     */
+    static isZipInImageUrl(velaImage) {
+        return velaImage.indexOf('0.0.2') < 0;
+    }
+    /** 获取vela镜像的下载地址 */
     static getSystemImageUrl(version = 'vela-release-4.0') {
-        if (this.isReleaseVelaImage(version)) {
-            return `${VelaAvdUtils.systemImageBaseUrl}/${version}/image.zip`;
+        if (VelaAvdUtils.isZipInImageUrl(version)) {
+            const velaImage = emulator_1.VelaImageVersionList.find((item) => item.value === version);
+            const dayOfTime = (0, dayjs_1.default)(velaImage === null || velaImage === void 0 ? void 0 : velaImage.time).format('YYYYMMDD');
+            return `${VelaAvdUtils.systemImageBaseUrl}/${version}/${dayOfTime}/${version}.zip`;
         }
         return `${VelaAvdUtils.systemImageBaseUrl}/${version}/nuttx`;
     }
+    /** 获取模拟器其他资源的下载地址 */
+    static getDownloadUrl(dir, version = '0.0.1', filename = dir) {
+        return `${VelaAvdUtils.baseUrl}/${dir}/v${version}/${filename}.zip`;
+    }
     /** 根据host获取ya-vm-file-server下载地址 */
     static getv9fsToolUrl(version = '0.0.1') {
         const systemOs = os_1.default.platform();
-        const arch = (0, utils_1.getSystemArch)();
+        const arch = (0, emulator_1.getSystemArch)();
         let v9fsTool = '';
         switch (systemOs) {
             case 'linux':
-                v9fsTool = `ya-vm-file-server-linux-${arch}`;
+                v9fsTool = 'ya-vm-file-server-linux-x86_64';
                 break;
             case 'win32':
                 v9fsTool = 'ya-vm-file-server-windows.exe';
                 break;
             case 'darwin':
                 v9fsTool = `ya-vm-file-server-darwin-${arch}`;
+                break;
             default:
                 break;
         }
         return `${VelaAvdUtils.baseUrl}/tools/v${version}/${v9fsTool}`;
     }
-    /** 获取资源文件下载地址 */
-    static getDownloadUrl(dir, version = '0.0.1', filename = dir) {
-        return `${VelaAvdUtils.baseUrl}/${dir}/v${version}/${filename}.zip`;
-    }
-    /**
-     * 判断vela镜像是release版还是dev版
-     * @param velaImage 镜像名称或者镜像路径
-     * @returns
-     */
-    static isReleaseVelaImage(velaImage) {
-        return velaImage.includes('release');
+    /** 获取镜像构建时间 */
+    static getImageBuildTime(imageId) {
+        var _a;
+        if (!imageId)
+            return;
+        const imagePath = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', imageId, 'nuttx');
+        if (fs_extra_1.default.existsSync(imagePath)) {
+            if (VelaAvdUtils.isZipInImageUrl(imageId)) {
+                const stats = fs_extra_1.default.statSync(imagePath);
+                return stats.mtime;
+            }
+            else {
+                const time = (_a = emulator_1.VelaImageVersionList.find((item) => item.value === imageId)) === null || _a === void 0 ? void 0 : _a.time;
+                return time;
+            }
+        }
+        return;
     }
     /**
      * 命令行访问方式创建模拟器
      */
     static createVelaAvdByInquire() {
         return __awaiter(this, void 0, void 0, function* () {
+            const versionFile = path_1.default.resolve(VelaAvdUtils.sdkHome, 'versions.json');
+            const versionFileExist = fs_extra_1.default.existsSync(versionFile);
+            let currVersionInfo = {
+                name: '模拟器资源版本管理',
+                emulator: '',
+                qa: '',
+                skins: '',
+                'system-images': '',
+                tools: '',
+                modem_simulator: ''
+            };
+            if (versionFileExist) {
+                currVersionInfo = fs_extra_1.default.readJSONSync(versionFile);
+            }
+            const onlineVersionInfo = emulator_1.EmulatorEnvVersion;
+            // 模拟器各项资源（除了镜像）是否存在
+            const emulatorExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'emulator', VelaAvdUtils.getEmulatorPlatform()));
+            const qaExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'qa/font'));
+            const skinsExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins'));
+            const toolsExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'tools'));
+            const modemSimulatorExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'modem_simulator/modem_nvram.json'));
             try {
-                const versionFile = path_1.default.resolve(VelaAvdUtils.sdkHome, 'versions.json');
-                const versionFileExist = fs_extra_1.default.existsSync(versionFile);
-                let versionInfo = undefined;
-                if (versionFileExist) {
-                    versionInfo = fs_extra_1.default.readJSONSync(versionFile);
-                }
-                const onlineVersionInfo = constants_1.emulatorEnvVersion;
                 // avdName
                 const avdName = yield (0, prompts_1.input)({
                     message: 'avd name starting with Vela. (eg. Vela_Virtual_Device)',
@@ -167,105 +235,199 @@ class VelaAvdUtils {
                         return VelaAvdUtils.validateAvdName(value);
                     }
                 });
-                // skin或者size
-                const needSkin = yield (0, prompts_1.confirm)({
-                    message: 'need avd skin?',
-                    default: true
+                // 镜像
+                const velaImage = yield (0, prompts_1.select)({
+                    message: 'vela image.',
+                    choices: emulator_1.VelaImageVersionList.map((item) => {
+                        return { value: item.value, name: item.label };
+                    })
                 });
-                const skinDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins');
-                const skinExists = fs_extra_1.default.existsSync(skinDir);
+                // skin或者size
                 let avdSkin = '';
-                let avdWidth = '';
-                let avdHeight = '';
-                if (needSkin) {
-                    if (!skinExists || (versionInfo && versionInfo.skins < onlineVersionInfo.skins)) {
-                        const skinsUrl = VelaAvdUtils.getDownloadUrl('skins', onlineVersionInfo.skins);
-                        yield VelaAvdUtils.downloadAndUnzip(skinsUrl, path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins'));
-                        ColorConsole_1.default.success(`Download skins succeed.`);
-                    }
-                    const skinList = VelaAvdUtils.velaAvdCls.getVelaSkinList();
-                    avdSkin = yield (0, prompts_1.select)({
-                        message: 'avd skin.',
-                        choices: skinList.map((item) => {
-                            return {
-                                name: item,
-                                value: item,
-                                description: item
-                            };
-                        })
-                    });
-                }
-                else {
-                    avdWidth = yield (0, prompts_1.input)({
-                        message: 'avd width.',
-                        default: '480'
-                    });
-                    avdHeight = yield (0, prompts_1.input)({
-                        message: 'avd height.',
-                        default: '480'
+                let avdWidth = '466';
+                let avdHeight = '466';
+                // vela4.0不允许自定义分辨率
+                if (velaImage.indexOf('vela-release') < 0) {
+                    const needSkin = yield (0, prompts_1.confirm)({
+                        message: 'need avd skin?',
+                        default: true
                     });
+                    if (needSkin) {
+                        if (!skinsExist || (currVersionInfo && currVersionInfo.skins < onlineVersionInfo.skins)) {
+                            const skinsUrl = VelaAvdUtils.getDownloadUrl('skins', onlineVersionInfo.skins);
+                            yield VelaAvdUtils.downloadAndUnzip(skinsUrl, path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins'));
+                            currVersionInfo.skins = emulator_1.EmulatorEnvVersion.skins;
+                            shared_utils_1.ColorConsole.success(`Download skins succeed.`);
+                        }
+                        const skinList = VelaAvdUtils.velaAvdCls.getVelaSkinList();
+                        avdSkin = yield (0, prompts_1.select)({
+                            message: 'avd skin.',
+                            choices: skinList.map((item) => {
+                                return {
+                                    name: item,
+                                    value: item,
+                                    description: item
+                                };
+                            })
+                        });
+                    }
+                    else {
+                        avdWidth = yield (0, prompts_1.input)({
+                            message: 'avd width.',
+                            default: '466'
+                        });
+                        avdHeight = yield (0, prompts_1.input)({
+                            message: 'avd height.',
+                            default: '466'
+                        });
+                    }
                 }
-                // 镜像，TODO：后续需要考虑多种设备的镜像
-                const velaImage = (yield (0, prompts_1.select)({
-                    message: 'vela image.',
-                    choices: [
-                        // { value: 'vela-release-4.0-pre', name: 'vela抢先版（4.0）' },
-                        { value: 'vela-dev-0.0.2', name: 'vela开发版（dev, 0.0.2）' }
-                    ]
-                }));
                 // 下载模拟器
-                const emulatorDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'emulator');
-                const emulatorExists = fs_extra_1.default.existsSync(emulatorDir);
-                if (!emulatorExists || (versionInfo && versionInfo.emulator < onlineVersionInfo.emulator)) {
+                if (!emulatorExist ||
+                    (currVersionInfo && currVersionInfo.emulator < onlineVersionInfo.emulator)) {
                     const emulatorDownloadUrl = VelaAvdUtils.getEmulatorUrl(onlineVersionInfo.emulator);
-                    yield VelaAvdUtils.downloadAndUnzip(emulatorDownloadUrl, emulatorDir);
-                    ColorConsole_1.default.success(`Download emulator succeed.`);
+                    yield VelaAvdUtils.downloadAndUnzip(emulatorDownloadUrl, VelaAvdUtils.getEmulatorEnvHome('emulator'));
+                    currVersionInfo.emulator = emulator_1.EmulatorEnvVersion.emulator;
+                    shared_utils_1.ColorConsole.success(`Download emulator succeed.`);
                 }
                 // 下载镜像
-                const velaImageDownloadUrl = this.getSystemImageUrl(velaImage);
                 const imageDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', velaImage);
-                const imageExists = fs_extra_1.default.existsSync(path_1.default.resolve(imageDir, 'nuttx'));
-                if (!imageExists) {
-                    if (this.isReleaseVelaImage(velaImage)) {
+                if (this.velaImageNeedUpdate(velaImage)) {
+                    const velaImageDownloadUrl = this.getSystemImageUrl(velaImage);
+                    if (VelaAvdUtils.isZipInImageUrl(velaImage)) {
                         yield VelaAvdUtils.downloadAndUnzip(velaImageDownloadUrl, imageDir);
+                        currVersionInfo['system-images'] = emulator_1.EmulatorEnvVersion['system-images'];
                     }
                     else {
                         yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
                     }
-                    ColorConsole_1.default.success(`Download vela image succeed.`);
+                    shared_utils_1.ColorConsole.success(`Download vela image succeed.`);
                 }
                 // 下载快应用qa文件
-                const qaDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'qa');
-                const qaExists = fs_extra_1.default.existsSync(qaDir);
-                if (!qaExists || (versionInfo && versionInfo.qa < onlineVersionInfo.qa)) {
+                if (!qaExist || (currVersionInfo && currVersionInfo.qa < onlineVersionInfo.qa)) {
                     const qaUrl = VelaAvdUtils.getDownloadUrl('qa', onlineVersionInfo.qa);
-                    yield VelaAvdUtils.downloadAndUnzip(qaUrl, qaDir);
-                    ColorConsole_1.default.success(`Download quickapp font succeed.`);
+                    yield VelaAvdUtils.downloadAndUnzip(qaUrl, VelaAvdUtils.getEmulatorEnvHome('qa'));
+                    currVersionInfo.qa = emulator_1.EmulatorEnvVersion.qa;
+                    shared_utils_1.ColorConsole.success(`Download quickapp font succeed.`);
                 }
                 // 下载tools
-                const toolsDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'tools');
-                const toolsExists = fs_extra_1.default.existsSync(toolsDir);
-                if (!toolsExists || (versionInfo && versionInfo.tools < onlineVersionInfo.tools)) {
+                if (!toolsExist || (currVersionInfo && currVersionInfo.tools < onlineVersionInfo.tools)) {
                     const v9fsToolUrl = VelaAvdUtils.getv9fsToolUrl();
                     const filename = os_1.default.platform() === 'win32' ? 'ya-vm-file-server.exe' : 'ya-vm-file-server';
-                    yield VelaAvdUtils.downloadFromCdn(v9fsToolUrl, toolsDir, filename);
-                    // 后续使用fatfs+adb push方式需要下载相关镜像
-                    // const imageUrl = VelaAvdUtils.getDownloadUrl('tools', onlineVersionInfo.tools, 'image')
-                    // const imageDir = path.resolve(toolsDir, 'image')
-                    // await VelaAvdUtils.downloadAndUnzip(imageUrl, imageDir)
-                    ColorConsole_1.default.success(`Download tools succeed.`);
+                    yield VelaAvdUtils.downloadFromCdn(v9fsToolUrl, VelaAvdUtils.getEmulatorEnvHome('tools'), filename);
+                    currVersionInfo.tools = emulator_1.EmulatorEnvVersion.tools;
+                    shared_utils_1.ColorConsole.success(`Download tools succeed.`);
+                }
+                // 下载modem_simulator
+                if (!modemSimulatorExist ||
+                    currVersionInfo.modem_simulator < emulator_1.EmulatorEnvVersion.modem_simulator) {
+                    const modemSimulatorUrl = VelaAvdUtils.getDownloadUrl('modem_simulator', emulator_1.EmulatorEnvVersion.modem_simulator);
+                    yield VelaAvdUtils.downloadAndUnzip(modemSimulatorUrl, VelaAvdUtils.getEmulatorEnvHome('modem_simulator'));
+                    currVersionInfo.modem_simulator = emulator_1.EmulatorEnvVersion.modem_simulator;
+                    shared_utils_1.ColorConsole.success(`Download modem simulator succeed.`);
                 }
-                // 替换version.json
-                const versionJson = JSON.stringify(onlineVersionInfo, null, 2);
-                fs_extra_1.default.writeFileSync(versionFile, versionJson);
                 // 创建avd文本文件
                 const avdImagePath = imageDir;
-                const avdParams = { avdName, avdSkin, avdWidth, avdHeight, avdArch: emulator_1.IAvdArchType.arm, avdImagePath };
+                const avdParams = {
+                    avdName,
+                    avdSkin,
+                    avdWidth,
+                    avdHeight,
+                    avdArch: emulator_1.IAvdArchType.arm,
+                    avdImagePath
+                };
                 VelaAvdUtils.velaAvdCls.createVelaAvd(avdParams);
-                ColorConsole_1.default.success(`Create avd succeed.`);
+                shared_utils_1.ColorConsole.success(`Create avd succeed.`);
+            }
+            catch (e) {
+                shared_utils_1.ColorConsole.throw(`Create avd failed. Error: ${e.message}`);
+            }
+            finally {
+                // 写入versions.json
+                const versionJson = JSON.stringify(currVersionInfo, null, 2);
+                fs_extra_1.default.writeFileSync(versionFile, versionJson);
+            }
+        });
+    }
+    /** 初始化/重置模拟器环境 */
+    static initEmulatorEnv() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const versionFile = path_1.default.resolve(VelaAvdUtils.sdkHome, 'versions.json');
+            const versionFileExist = fs_extra_1.default.existsSync(versionFile);
+            let currVersionInfo = {
+                name: '模拟器资源版本管理',
+                emulator: '',
+                qa: '',
+                skins: '',
+                'system-images': '',
+                tools: '',
+                modem_simulator: ''
+            };
+            if (versionFileExist) {
+                currVersionInfo = fs_extra_1.default.readJSONSync(versionFile);
+            }
+            // 模拟器的各项资源是否存在
+            const emulatorExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'emulator', VelaAvdUtils.getEmulatorPlatform()));
+            const qaExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'qa/font'));
+            const skinsExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins'));
+            const toolsExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'tools'));
+            const modemSimulatorExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'modem_simulator/modem_nvram.json'));
+            const systemImageExist = fs_extra_1.default.existsSync(path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', emulator_1.VelaImageVersionList[0].value, 'nuttx'));
+            try {
+                // 下载皮肤
+                if (!skinsExist || currVersionInfo.skins < emulator_1.EmulatorEnvVersion.skins) {
+                    const skinsUrl = VelaAvdUtils.getDownloadUrl('skins', emulator_1.EmulatorEnvVersion.skins);
+                    yield VelaAvdUtils.downloadAndUnzip(skinsUrl, VelaAvdUtils.getEmulatorEnvHome('skins'));
+                    currVersionInfo.skins = emulator_1.EmulatorEnvVersion.skins;
+                    shared_utils_1.ColorConsole.success(`Download skins succeed.`);
+                }
+                // 下载快应用font
+                if (!qaExist || currVersionInfo.qa < emulator_1.EmulatorEnvVersion.qa) {
+                    const qaUrl = VelaAvdUtils.getDownloadUrl('qa', emulator_1.EmulatorEnvVersion.qa);
+                    yield VelaAvdUtils.downloadAndUnzip(qaUrl, VelaAvdUtils.getEmulatorEnvHome('qa'));
+                    currVersionInfo.qa = emulator_1.EmulatorEnvVersion.qa;
+                    shared_utils_1.ColorConsole.success(`Download quickapp font succeed.`);
+                }
+                // 下载工具
+                if (!toolsExist || currVersionInfo.tools < emulator_1.EmulatorEnvVersion.tools) {
+                    const v9fsToolUrl = VelaAvdUtils.getv9fsToolUrl(emulator_1.EmulatorEnvVersion.tools);
+                    const filename = os_1.default.platform() === 'win32' ? 'ya-vm-file-server.exe' : 'ya-vm-file-server';
+                    yield VelaAvdUtils.downloadFromCdn(v9fsToolUrl, VelaAvdUtils.getEmulatorEnvHome('tools'), filename);
+                    currVersionInfo.tools = emulator_1.EmulatorEnvVersion.tools;
+                    shared_utils_1.ColorConsole.success(`Download tools succeed.`);
+                }
+                // 下载模拟器
+                if (!emulatorExist || currVersionInfo.emulator < emulator_1.EmulatorEnvVersion.emulator) {
+                    const emulatorUrl = VelaAvdUtils.getEmulatorUrl(emulator_1.EmulatorEnvVersion.emulator);
+                    yield VelaAvdUtils.downloadAndUnzip(emulatorUrl, VelaAvdUtils.getEmulatorEnvHome('emulator'));
+                    currVersionInfo.emulator = emulator_1.EmulatorEnvVersion.emulator;
+                    shared_utils_1.ColorConsole.success(`Download emulator succeed.`);
+                }
+                // 下载modem_simultor
+                if (!modemSimulatorExist ||
+                    currVersionInfo.modem_simulator < emulator_1.EmulatorEnvVersion.modem_simulator) {
+                    const modemSimulatorUrl = VelaAvdUtils.getDownloadUrl('modem_simulator', emulator_1.EmulatorEnvVersion.modem_simulator);
+                    yield VelaAvdUtils.downloadAndUnzip(modemSimulatorUrl, VelaAvdUtils.getEmulatorEnvHome('modem_simulator'));
+                    currVersionInfo.modem_simulator = emulator_1.EmulatorEnvVersion.modem_simulator;
+                    shared_utils_1.ColorConsole.success(`Download modem simulator succeed.`);
+                }
+                // 下载vela镜像，默认只下载最新的vela正式版，dev版本需要创建模拟器的时候手动勾选
+                if (!systemImageExist || VelaAvdUtils.velaImageNeedUpdate(emulator_1.VelaImageVersionList[0].value)) {
+                    const systemImageUrl = VelaAvdUtils.getSystemImageUrl(emulator_1.VelaImageVersionList[0].value);
+                    const imageDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', emulator_1.VelaImageVersionList[0].value);
+                    yield VelaAvdUtils.downloadAndUnzip(systemImageUrl, imageDir);
+                    currVersionInfo['system-images'] = emulator_1.EmulatorEnvVersion['system-images'];
+                    shared_utils_1.ColorConsole.success(`Download vela image succeed.`);
+                }
+                shared_utils_1.ColorConsole.success(`Create emulator environment succeed.`);
             }
             catch (e) {
-                ColorConsole_1.default.throw(`Create avd failed. Error: ${e.message}`);
+                shared_utils_1.ColorConsole.throw(`Create emulator environment failed. Error: ${e.message}`);
+            }
+            finally {
+                // 写入versions.json
+                const versionJson = JSON.stringify(currVersionInfo, null, 2);
+                fs_extra_1.default.writeFileSync(versionFile, versionJson);
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2-dev.8",
+  "version": "2.0.2",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -21,24 +21,32 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/commander": "2.0.2-dev.8",
-    "@aiot-toolkit/emulator": "2.0.2-dev.8",
-    "@aiot-toolkit/shared-utils": "2.0.2-dev.8",
-    "@miwt/adb": "^0.7.1",
-    "adb-commander": "^0.1.9",
+    "@aiot-toolkit/aiotpack": "2.0.2",
+    "@aiot-toolkit/commander": "2.0.2",
+    "@aiot-toolkit/emulator": "2.0.2",
+    "@aiot-toolkit/shared-utils": "2.0.2",
+    "@inquirer/prompts": "^5.3.0",
+    "@miwt/adb": "^0.9.0",
     "adm-zip": "^0.5.10",
-    "axios": "^1.5.0",
+    "axios": "^1.7.4",
     "cli-progress": "^3.12.0",
-    "create-aiot": "2.0.2-dev.8",
-    "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-dev.8",
-    "semver": "^7.6.0",
+    "dayjs": "^1.11.10",
+    "file-lane": "2.0.2",
+    "fs-extra": "^11.2.0",
+    "koa-router": "^13.0.1",
+    "lodash": "^4.17.21",
+    "portfinder": "^1.0.32",
+    "qr-image": "^3.2.0",
+    "semver": "^7.6.3",
     "ws": "^8.15.1"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.4",
+    "@types/fs-extra": "^11.0.4",
+    "@types/koa-router": "^7.4.8",
+    "@types/qr-image": "^3.2.9",
     "@types/semver": "^7.5.8",
     "@types/ws": "^8.5.10"
   },
-  "gitHead": "831575362ba47778c9441f95cec41ddded36cffc"
+  "gitHead": "8ca4bf2ed7bcf11911e5c514696951bdba4fc12d"
 }

package/lib/builder/UxBuilder.d.ts

@@ -1,27 +0,0 @@
-import CompileMode from '@aiot-toolkit/aiotpack/lib/compiler/enum/CompileMode';
-import ParamType from '@aiot-toolkit/commander/lib/interface/IParam';
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
-import IBuilder from './IBuilder';
-interface IUxBuilderOption extends Dictionary {
-    watch?: boolean;
-    mode: CompileMode;
-    disabledJsc: boolean;
-}
-/**
- * UxBuilder
- */
-declare class UxBuilder implements IBuilder<IUxBuilderOption> {
-    readonly QUICKAPP_CONFIG = "quickapp.config.js";
-    /**
-     * ux项目的build函数
-     * @param projectPath 项目路径
-     * @param options 命令参数
-     * @param watch 是否开启监听
-     */
-    build(projectPath: string, options: IUxBuilderOption): Promise<void>;
-    private readQuickAppConfig;
-    static readonly PROJECT_TYPE = "ux quick app";
-    params: ParamType[];
-    match(projectPath: string): boolean;
-}
-export default UxBuilder;