aiot-toolkit 2.0.1-alpha.9 → 2.0.2-batchmanifest-beta.1

package/lib/utils/UxBuilderUtils.js

@@ -0,0 +1,51 @@
+"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"));
+/**
+ * UxBuilderUtils
+ */
+class UxBuilderUtils {
+    static getDevtoolValue(mode, devtool) {
+        const sourcemaps = {
+            development: {
+                default: 'cheap-source-map',
+                options: [
+                    false,
+                    'cheap-source-map',
+                    'cheap-module-source-map',
+                    'inline-cheap-source-map',
+                    'inline-cheap-module-source-map',
+                    'source-map',
+                    'inline-source-map',
+                    'hidden-source-map',
+                    'nosources-source-map'
+                ]
+            },
+            production: {
+                default: false,
+                options: [
+                    false,
+                    'cheap-source-map',
+                    'cheap-module-source-map',
+                    'source-map',
+                    'hidden-source-map',
+                    'nosources-source-map'
+                ]
+            }
+        };
+        const sourcemapArr = sourcemaps[mode].options;
+        const defaultSourcemap = sourcemaps[mode].default;
+        if (typeof devtool !== 'string' && typeof devtool !== 'boolean') {
+            return defaultSourcemap;
+        }
+        if (sourcemapArr.indexOf(devtool) === -1) {
+            ColorConsole_1.default.warn(`The devtool in ${mode} mode does not support '${devtool}', change to default '${defaultSourcemap}'`);
+            return defaultSourcemap;
+        }
+        return devtool;
+    }
+}
+exports.default = UxBuilderUtils;

package/lib/utils/VelaAvdUtils.d.ts

@@ -7,6 +7,7 @@ declare class VelaAvdUtils {
     static emulatorBaseUrl: string;
     static systemImageBaseUrl: string;
     static velaAvdCls: VelaAvdCls;
+    /** 校验AVD名称 */
     static validateAvdName(avdName: string): true | "Please enter avd name" | "The avd name must starts with Vela" | "The avd already exists. Please change avd name";
     /**
      * 从CDN上下载资源文件
@@ -25,15 +26,36 @@ declare class VelaAvdUtils {
     static downloadAndUnzip(downloadUrl: string, targetDir: string): Promise<void>;
     /** 根据host获取模拟器下载地址 */
     static getEmulatorUrl(version?: string): string;
-    /** 根据host获取vela镜像下载地址 */
-    static getSystemImageUrl(version?: string, device?: string): string;
+    /** 获取模拟器平台的名称，darwin-aarch64 linux-aarch64 windows-x86_64等 */
+    static getEmulatorPlatform(): string;
+    /** 获取各项模拟器资源的根目录 */
+    static getEmulatorEnvHome(resourceName: string): string;
+    /**
+     * Vela镜像需要更新
+     * @param imageId 镜像id
+     * @returns {boolean}
+     */
+    static velaImageNeedUpdate(imageId: string): boolean;
+    /**
+     * Vela镜像是否为zip包（是否为0.0.2版本）
+     * 只有Vela开发版（dev, 0.0.2）这个版本的镜像不是zip包
+     * @param velaImage
+     * @returns
+     */
+    static isZipInImageUrl(velaImage: string): boolean;
+    /** 获取vela镜像的下载地址 */
+    static getSystemImageUrl(version?: string): string;
+    /** 获取模拟器其他资源的下载地址 */
+    static getDownloadUrl(dir: string, version?: string, filename?: string): string;
     /** 根据host获取ya-vm-file-server下载地址 */
     static getv9fsToolUrl(version?: string): string;
-    /** 获取资源文件下载地址 */
-    static getDownloadUrl(file: string, version?: string): string;
+    /** 获取镜像构建时间 */
+    static getImageBuildTime(imageId: string): string | Date | undefined;
     /**
      * 命令行访问方式创建模拟器
      */
     static createVelaAvdByInquire(): Promise<void>;
+    /** 初始化/重置模拟器环境 */
+    static initEmulatorEnv(): Promise<void>;
 }
 export default VelaAvdUtils;

package/lib/utils/VelaAvdUtils.js

@@ -13,7 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const emulator_1 = require("@aiot-toolkit/emulator");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+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 prompts_1 = require("@inquirer/prompts");
 const adm_zip_1 = __importDefault(require("adm-zip"));
@@ -22,7 +23,9 @@ const cli_progress_1 = __importDefault(require("cli-progress"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const dayjs_1 = __importDefault(require("dayjs"));
 class VelaAvdUtils {
+    /** 校验AVD名称 */
     static validateAvdName(avdName) {
         if (!avdName) {
             return `Please enter avd name`;
@@ -68,11 +71,7 @@ class VelaAvdUtils {
                 });
             }
             catch (e) {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: `download ${filename} failed`
-                });
-                progress.stop();
+                ColorConsole_1.default.throw(`Download ${filename} failed`);
                 reject();
             }
         }));
@@ -107,34 +106,68 @@ class VelaAvdUtils {
     /** 根据host获取模拟器下载地址 */
     static getEmulatorUrl(version = '0.0.1') {
         const systemOs = os_1.default.platform();
-        const arch = os_1.default.arch();
-        let hostOs = '';
-        let hostArch = '';
-        switch (systemOs) {
-            case 'linux':
-                hostOs = 'linux';
-                hostArch = arch === 'x64' ? 'x86_64' : 'aarch64';
-                break;
-            case 'win32':
-                hostOs = 'windows';
-                hostArch = arch === 'x64' ? 'x86_64' : 'aarch64';
-                break;
-            case 'darwin':
-                hostOs = 'darwin';
-                hostArch = arch === 'x64' ? 'x86_64' : 'aarch64';
-            default:
-                break;
-        }
+        const hostArch = (0, utils_1.getSystemArch)();
+        let hostOs = systemOs === 'win32' ? 'windows' : systemOs;
         return `${VelaAvdUtils.emulatorBaseUrl}/v${version}/${hostOs}-${hostArch}.zip`;
     }
-    /** 根据host获取vela镜像下载地址 */
-    static getSystemImageUrl(version = '0.0.1', device = 'arm') {
-        return `${VelaAvdUtils.systemImageBaseUrl}/v${version}/${device}/nuttx`;
+    /** 获取模拟器平台的名称，darwin-aarch64 linux-aarch64 windows-x86_64等 */
+    static getEmulatorPlatform() {
+        const systemOs = os_1.default.platform();
+        const hostArch = (0, utils_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 = constants_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 (VelaAvdUtils.isZipInImageUrl(version)) {
+            const velaImage = constants_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 = os_1.default.arch();
+        const arch = (0, utils_1.getSystemArch)();
         let v9fsTool = '';
         switch (systemOs) {
             case 'linux':
@@ -144,32 +177,58 @@ class VelaAvdUtils {
                 v9fsTool = 'ya-vm-file-server-windows.exe';
                 break;
             case 'darwin':
-                v9fsTool = (arch === 'x64') ? 'ya-vm-file-server-darwin-x84_64' : 'ya-vm-file-server-darwin-aarch64';
+                v9fsTool = `ya-vm-file-server-darwin-${arch}`;
+                break;
             default:
                 break;
         }
         return `${VelaAvdUtils.baseUrl}/tools/v${version}/${v9fsTool}`;
     }
-    /** 获取资源文件下载地址 */
-    static getDownloadUrl(file, version = '0.0.1') {
-        return `${VelaAvdUtils.baseUrl}/${file}/v${version}/${file}.zip`;
+    /** 获取镜像构建时间 */
+    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 = constants_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 = constants_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);
-                }
-                // 下载version.json，保证每次下载的文件都是最新的版本
-                yield VelaAvdUtils.downloadFromCdn(VelaAvdUtils.versionUrl, VelaAvdUtils.sdkHome, 'online-version.json');
-                const onlineVersionFile = path_1.default.resolve(VelaAvdUtils.sdkHome, 'online-version.json');
-                const onlineVersionInfo = fs_extra_1.default.readJSONSync(onlineVersionFile);
                 // avdName
                 const avdName = yield (0, prompts_1.input)({
                     message: 'avd name starting with Vela. (eg. Vela_Virtual_Device)',
@@ -178,117 +237,189 @@ class VelaAvdUtils {
                         return VelaAvdUtils.validateAvdName(value);
                     }
                 });
+                // 镜像
+                const velaImage = (yield (0, prompts_1.select)({
+                    message: 'vela image.',
+                    choices: constants_1.VelaImageVersionList.map((item) => {
+                        return { value: item.value, name: item.label };
+                    })
+                }));
                 // skin或者size
-                const needSkin = yield (0, prompts_1.confirm)({
-                    message: 'need avd skin?',
-                    default: true
-                });
-                const skinDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'skins');
-                const skinExists = fs_extra_1.default.existsSync(skinDir);
                 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.log({
-                            level: shared_utils_1.LOG_LEVEL.Success,
-                            message: `download skins succeed.`
+                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 = constants_1.EmulatorEnvVersion.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: '466'
+                        });
+                        avdHeight = yield (0, prompts_1.input)({
+                            message: 'avd height.',
+                            default: '466'
                         });
                     }
-                    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'
-                    });
                 }
-                // 镜像，TODO：后续需要考虑多种设备的镜像
-                const avdArch = (yield (0, prompts_1.select)({
-                    message: 'vela image.',
-                    choices: [{ value: 'arm' }, { value: 'arm64' }]
-                }));
                 // 下载模拟器
-                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.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `download emulator succeed.`
-                    });
+                    yield VelaAvdUtils.downloadAndUnzip(emulatorDownloadUrl, VelaAvdUtils.getEmulatorEnvHome('emulator'));
+                    currVersionInfo.emulator = constants_1.EmulatorEnvVersion.emulator;
+                    ColorConsole_1.default.success(`Download emulator succeed.`);
                 }
                 // 下载镜像
-                const velaImageDownloadUrl = this.getSystemImageUrl(onlineVersionInfo['system-images'], avdArch);
-                const imageDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', avdArch);
-                const imageExists = fs_extra_1.default.existsSync(path_1.default.resolve(imageDir, 'nuttx'));
-                if (!imageExists ||
-                    (versionInfo && versionInfo['system-images'] < onlineVersionInfo['system-images'])) {
-                    yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `download vela image succeed.`
-                    });
+                const imageDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', velaImage);
+                if (this.velaImageNeedUpdate(velaImage)) {
+                    const velaImageDownloadUrl = this.getSystemImageUrl(velaImage);
+                    if (VelaAvdUtils.isZipInImageUrl(velaImage)) {
+                        yield VelaAvdUtils.downloadAndUnzip(velaImageDownloadUrl, imageDir);
+                        currVersionInfo['system-images'] = constants_1.EmulatorEnvVersion['system-images'];
+                    }
+                    else {
+                        yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
+                    }
+                    ColorConsole_1.default.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.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `download quickapp font succeed.`
-                    });
+                    yield VelaAvdUtils.downloadAndUnzip(qaUrl, VelaAvdUtils.getEmulatorEnvHome('qa'));
+                    currVersionInfo.qa = constants_1.EmulatorEnvVersion.qa;
+                    ColorConsole_1.default.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);
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `download tools succeed.`
-                    });
+                    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 = constants_1.EmulatorEnvVersion.tools;
+                    ColorConsole_1.default.success(`Download tools succeed.`);
                 }
-                // 替换version.json
-                if (versionFileExist) {
-                    fs_extra_1.default.rmSync(versionFile);
+                // 下载modem_simulator
+                if (!modemSimulatorExist || currVersionInfo.modem_simulator < constants_1.EmulatorEnvVersion.modem_simulator) {
+                    const modemSimulatorUrl = VelaAvdUtils.getDownloadUrl('modem_simulator', constants_1.EmulatorEnvVersion.modem_simulator);
+                    yield VelaAvdUtils.downloadAndUnzip(modemSimulatorUrl, VelaAvdUtils.getEmulatorEnvHome('modem_simulator'));
+                    currVersionInfo.modem_simulator = constants_1.EmulatorEnvVersion.modem_simulator;
+                    ColorConsole_1.default.success(`Download modem simulator succeed.`);
                 }
-                fs_extra_1.default.renameSync(onlineVersionFile, versionFile);
                 // 创建avd文本文件
                 const avdImagePath = imageDir;
-                const avdParams = { avdName, avdSkin, avdWidth, avdHeight, avdArch, avdImagePath };
+                const avdParams = { avdName, avdSkin, avdWidth, avdHeight, avdArch: emulator_1.IAvdArchType.arm, avdImagePath };
                 VelaAvdUtils.velaAvdCls.createVelaAvd(avdParams);
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Success,
-                    message: `create avd succeed.`
-                });
+                ColorConsole_1.default.success(`Create avd succeed.`);
             }
             catch (e) {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: `create avd failed. Error: ${e.message}`
-                });
+                ColorConsole_1.default.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', constants_1.VelaImageVersionList[0].value, 'nuttx'));
+            try {
+                // 下载皮肤
+                if (!skinsExist || currVersionInfo.skins < constants_1.EmulatorEnvVersion.skins) {
+                    const skinsUrl = VelaAvdUtils.getDownloadUrl('skins', constants_1.EmulatorEnvVersion.skins);
+                    yield VelaAvdUtils.downloadAndUnzip(skinsUrl, VelaAvdUtils.getEmulatorEnvHome('skins'));
+                    currVersionInfo.skins = constants_1.EmulatorEnvVersion.skins;
+                    ColorConsole_1.default.success(`Download skins succeed.`);
+                }
+                // 下载快应用font
+                if (!qaExist || currVersionInfo.qa < constants_1.EmulatorEnvVersion.qa) {
+                    const qaUrl = VelaAvdUtils.getDownloadUrl('qa', constants_1.EmulatorEnvVersion.qa);
+                    yield VelaAvdUtils.downloadAndUnzip(qaUrl, VelaAvdUtils.getEmulatorEnvHome('qa'));
+                    currVersionInfo.qa = constants_1.EmulatorEnvVersion.qa;
+                    ColorConsole_1.default.success(`Download quickapp font succeed.`);
+                }
+                // 下载工具
+                if (!toolsExist || currVersionInfo.tools < constants_1.EmulatorEnvVersion.tools) {
+                    const v9fsToolUrl = VelaAvdUtils.getv9fsToolUrl(constants_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 = constants_1.EmulatorEnvVersion.tools;
+                    ColorConsole_1.default.success(`Download tools succeed.`);
+                }
+                // 下载模拟器
+                if (!emulatorExist || currVersionInfo.emulator < constants_1.EmulatorEnvVersion.emulator) {
+                    const emulatorUrl = VelaAvdUtils.getEmulatorUrl(constants_1.EmulatorEnvVersion.emulator);
+                    yield VelaAvdUtils.downloadAndUnzip(emulatorUrl, VelaAvdUtils.getEmulatorEnvHome('emulator'));
+                    currVersionInfo.emulator = constants_1.EmulatorEnvVersion.emulator;
+                    ColorConsole_1.default.success(`Download emulator succeed.`);
+                }
+                // 下载modem_simultor
+                if (!modemSimulatorExist || currVersionInfo.modem_simulator < constants_1.EmulatorEnvVersion.modem_simulator) {
+                    const modemSimulatorUrl = VelaAvdUtils.getDownloadUrl('modem_simulator', constants_1.EmulatorEnvVersion.modem_simulator);
+                    yield VelaAvdUtils.downloadAndUnzip(modemSimulatorUrl, VelaAvdUtils.getEmulatorEnvHome('modem_simulator'));
+                    currVersionInfo.modem_simulator = constants_1.EmulatorEnvVersion.modem_simulator;
+                    ColorConsole_1.default.success(`Download modem simulator succeed.`);
+                }
+                // 下载vela镜像，默认只下载最新的vela正式版，dev版本需要创建模拟器的时候手动勾选
+                if (!systemImageExist || VelaAvdUtils.velaImageNeedUpdate(constants_1.VelaImageVersionList[0].value)) {
+                    const systemImageUrl = VelaAvdUtils.getSystemImageUrl(constants_1.VelaImageVersionList[0].value);
+                    const imageDir = path_1.default.resolve(VelaAvdUtils.sdkHome, 'system-images', constants_1.VelaImageVersionList[0].value);
+                    yield VelaAvdUtils.downloadAndUnzip(systemImageUrl, imageDir);
+                    currVersionInfo['system-images'] = constants_1.EmulatorEnvVersion['system-images'];
+                    ColorConsole_1.default.success(`Download vela image succeed.`);
+                }
+                ColorConsole_1.default.success(`Create emulator environment succeed.`);
+            }
+            catch (e) {
+                ColorConsole_1.default.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);
             }
         });
     }
@@ -296,7 +427,7 @@ class VelaAvdUtils {
 VelaAvdUtils.sdkHome = path_1.default.resolve(os_1.default.homedir(), '.export');
 VelaAvdUtils.avdHome = path_1.default.resolve(os_1.default.homedir(), '.android', 'avd');
 VelaAvdUtils.baseUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide';
-VelaAvdUtils.versionUrl = 'https://cdn.cnbj3-fusion.fds.api.mi-img.com/vela-ide/versions.json';
+VelaAvdUtils.versionUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/versions.json';
 VelaAvdUtils.emulatorBaseUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/emulator';
 VelaAvdUtils.systemImageBaseUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/system-images';
 VelaAvdUtils.velaAvdCls = new emulator_1.VelaAvdCls({
@@ -304,5 +435,3 @@ VelaAvdUtils.velaAvdCls = new emulator_1.VelaAvdCls({
     avdHome: VelaAvdUtils.avdHome
 });
 exports.default = VelaAvdUtils;
-
-//# sourceMappingURL=VelaAvdUtils.js.map

package/lib/waiter.js

@@ -35,5 +35,3 @@ const waiter = new commander_1.PersistentCommand({
     ]
 });
 exports.default = waiter;
-
-//# sourceMappingURL=waiter.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.1-alpha.9",
+  "version": "2.0.2-batchmanifest-beta.1",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -17,26 +17,32 @@
   "files": [
     "lib"
   ],
-  "repository": {
-    "type": "git",
-    "url": "ssh://xujunjie1@git.mioffice.cn:29418/vela/aiot-toolkit"
-  },
   "scripts": {
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/emulator": "2.0.1-alpha.9",
-    "@aiot-toolkit/shared-utils": "2.0.1-alpha.9",
+    "@aiot-toolkit/commander": "2.0.2-batchmanifest-beta.1",
+    "@aiot-toolkit/emulator": "2.0.2-batchmanifest-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.2-batchmanifest-beta.1",
     "@miwt/adb": "^0.7.1",
     "adb-commander": "^0.1.9",
     "adm-zip": "^0.5.10",
     "axios": "^1.5.0",
     "cli-progress": "^3.12.0",
-    "create-aiot": "2.0.1-alpha.9",
-    "fast-glob": "^3.3.2"
+    "create-aiot": "2.0.2-batchmanifest-beta.1",
+    "dayjs": "^1.11.10",
+    "fast-glob": "^3.3.2",
+    "file-lane": "2.0.2-batchmanifest-beta.1",
+    "lodash": "^4.17.21",
+    "semver": "^7.6.0",
+    "ws": "^8.15.1"
   },
   "devDependencies": {
-    "@types/adm-zip": "^0.5.4"
+    "@types/adm-zip": "^0.5.4",
+    "@types/fs-extra": "^11.0.4",
+    "@types/semver": "^7.5.8",
+    "@types/ws": "^8.5.10",
+    "fs-extra": "^11.2.0"
   },
-  "gitHead": "d593999b9ca345bce8b3ba40a7d11f6685ac03b5"
+  "gitHead": "9e58a0cbe0e2d35a38e99d669398caaa8fd648a8"
 }