aiot-toolkit 2.0.2-beta.1 → 2.0.2-beta.10

package/lib/bin.js

@@ -196,7 +196,14 @@ function main() {
                             VelaAvdUtils_1.default.velaAvdCls.deleteVelaAvd(avdName);
                         });
                     })
-                }
+                },
+                {
+                    name: 'initEmulatorEnv',
+                    description: 'init/reset emulator environment',
+                    action: () => __awaiter(this, void 0, void 0, function* () {
+                        VelaAvdUtils_1.default.initEmulatorEnv();
+                    })
+                },
             ]
         };
         commander_1.Command.registeProgram(config);

package/lib/builder/UxBuilder.d.ts

@@ -1,4 +1,5 @@
 import CompileMode from '@aiot-toolkit/aiotpack/lib/compiler/enum/CompileMode';
+import IJavascriptCompileOption from '@aiot-toolkit/aiotpack/lib/compiler/javascript/interface/IJavascriptCompileOption';
 import ParamType from '@aiot-toolkit/commander/lib/interface/IParam';
 import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
 import IBuilder from './IBuilder';
@@ -6,12 +7,19 @@ interface IUxBuilderOption extends Dictionary {
     watch?: boolean;
     mode: CompileMode;
     disabledJsc: boolean;
+    enableE2e?: boolean;
 }
 /**
  * UxBuilder
  */
 declare class UxBuilder implements IBuilder<IUxBuilderOption> {
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
+    /**
+     * 获取build的编译配置
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     */
+    getCompilerOption(projectPath: string, options: IUxBuilderOption): Partial<IJavascriptCompileOption>;
     /**
      * ux项目的build函数
      * @param projectPath 项目路径

package/lib/builder/UxBuilder.js

@@ -40,10 +40,6 @@ class UxBuilder {
     constructor() {
         this.QUICKAPP_CONFIG = 'quickapp.config.js';
         this.params = [
-            {
-                name: 'enable-e2e',
-                description: 'inject test-suite for current project'
-            },
             {
                 type: 'string',
                 name: 'devtool',
@@ -60,13 +56,48 @@ class UxBuilder {
                 defaultValue: false
             },
             {
+                type: 'confirm',
                 name: 'enable-protobuf',
                 description: 'enable protobuf',
+                defaultValue: false
+            },
+            {
                 type: 'confirm',
+                name: 'enable-e2e',
+                description: 'inject test-suite for current project',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'enable-stats',
+                description: 'analyse time and size of webpack output files',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'optimize-css-attr',
+                description: 'optimize css attr',
                 defaultValue: false
             }
         ];
     }
+    /**
+     * 获取build的编译配置
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     */
+    getCompilerOption(projectPath, options) {
+        // 读取项目中文件的配置
+        const quickappConfig = this.readQuickAppConfig(projectPath);
+        const _a = quickappConfig || {}, { cli } = _a, otherConfig = __rest(_a, ["cli"]);
+        options = lodash_1.default.merge({}, options, cli);
+        // 项目配置
+        const uxProjectConfig = new UxConfig_1.default(projectPath);
+        // 编译配置
+        const compileMode = options.mode || CompileMode_1.default.DEVELOPMENT;
+        const compilerOption = lodash_1.default.merge(JavascriptDefaultCompileOption_1.default, Object.assign(Object.assign({}, options), { projectPath: path_1.default.join(projectPath, uxProjectConfig.output), mode: compileMode, enableProtobuf: options.enableProtobuf, devtool: UxBuilderUtils_1.default.getDevtoolValue(compileMode, options.devtool || false) }), otherConfig);
+        return compilerOption;
+    }
     /**
      * ux项目的build函数
      * @param projectPath 项目路径
@@ -76,21 +107,10 @@ class UxBuilder {
     build(projectPath, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const watch = options.watch || false;
-            // 读取项目中文件的配置
-            const quickappConfig = this.readQuickAppConfig(projectPath);
-            const _a = quickappConfig || {}, { cli } = _a, otherConfig = __rest(_a, ["cli"]);
-            options = lodash_1.default.merge({}, options, cli);
             // 项目配置
             const uxProjectConfig = new UxConfig_1.default(projectPath);
             // 编译配置
-            const compileMode = options.mode || CompileMode_1.default.DEVELOPMENT;
-            const compilerOption = lodash_1.default.merge({
-                projectPath: path_1.default.join(projectPath, uxProjectConfig.output),
-                mode: compileMode,
-                disabledJSC: options.disabledJsc,
-                enableProtobuf: options.enableProtobuf,
-                devtool: UxBuilderUtils_1.default.getDevtoolValue(compileMode, options.devtool)
-            }, JavascriptDefaultCompileOption_1.default, otherConfig);
+            const compilerOption = this.getCompilerOption(projectPath, options);
             ColorConsole_1.default.info('start build: ', {
                 style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Info),
                 word: JSON.stringify({

package/lib/builder/XtsBuilder.js

@@ -73,7 +73,7 @@ class XtsBuilder {
                 const follWorks = config.followWorks || [];
                 for (let item of follWorks) {
                     try {
-                        yield item(context, config, compilerOptions);
+                        yield item.worker(context, config, compilerOptions);
                     }
                     catch (error) {
                         // 报错 prework的item error

package/lib/interface/VelaEmulatorInterface.d.ts

@@ -1,13 +1,14 @@
-export interface ISystemImagesVersionInfo {
-    release: string;
-    dev: string;
-}
-export type ISystemImagesType = keyof ISystemImagesVersionInfo;
 export interface IGoldfishVersionInfo {
     name: string;
     emulator: string;
-    'system-images': ISystemImagesVersionInfo;
+    'system-images': string;
     qa: string;
     skins: string;
     tools: string;
+    modem_simulator: string;
+}
+export interface IVelaImageItem {
+    label: string;
+    value: string;
+    time: string | Date;
 }

package/lib/starter/UxStarter.d.ts

@@ -2,9 +2,20 @@ import ParamType from '@aiot-toolkit/commander/lib/interface/IParam';
 import { IStartOptions } from '@aiot-toolkit/emulator';
 import UxBuilder from '../builder/UxBuilder';
 import IStarter from './IStarter';
+/**
+ * UxStarter
+ * ux快应用启动器
+ */
 declare class UxStarter extends IStarter<IStartOptions> {
     builder: UxBuilder;
     params: ParamType[];
     start(projectPath: string, options: any): Promise<void>;
+    /**
+     * 检查选择的模拟器在当前环境下是否可以使用
+     * 下面的几种情况会导致模拟器不可用：1. 模拟器绑定的Vela镜像不存在；2. Vela4.0缺少coredump.core或者vela_data.bin文件
+     * @param avdName 模拟器名称
+     * @returns {boolean}
+     */
+    isAvailableEmulator(avdName: string): boolean;
 }
 export default UxStarter;

package/lib/starter/UxStarter.js

@@ -46,6 +46,11 @@ const portfinder_1 = __importDefault(require("portfinder"));
 const UxBuilder_1 = __importDefault(require("../builder/UxBuilder"));
 const VelaAvdUtils_1 = __importDefault(require("../utils/VelaAvdUtils"));
 const IStarter_1 = __importDefault(require("./IStarter"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+/**
+ * UxStarter
+ * ux快应用启动器
+ */
 class UxStarter extends IStarter_1.default {
     constructor() {
         super(...arguments);
@@ -74,9 +79,10 @@ class UxStarter extends IStarter_1.default {
     }
     start(projectPath, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            // 获取已经创建的模拟器列表
             const avdList = VelaAvdUtils_1.default.velaAvdCls.getVelaAvdList();
             if (avdList.length === 0) {
-                ColorConsole_1.default.error('### goldfish start ### No vela emulator available, please create it first.');
+                ColorConsole_1.default.error('no vela emulator available, please create it first.');
                 VelaAvdUtils_1.default.createVelaAvdByInquire();
                 return;
             }
@@ -86,6 +92,11 @@ class UxStarter extends IStarter_1.default {
                     return { value: item.avdName };
                 })
             });
+            // 检查选择的模拟器是否符合要求
+            if (!this.isAvailableEmulator(avdName)) {
+                ColorConsole_1.default.throw(`this emulator is unavailable, please create a new emulator.`);
+                return;
+            }
             let serverPort;
             // watch模型下开启server
             if (options.watch) {
@@ -95,19 +106,33 @@ class UxStarter extends IStarter_1.default {
                 (0, JavascriptDefaultCompileOption_1.setServerPort)(serverPort);
             }
             // build
+            const compilerOption = this.builder.getCompilerOption(projectPath, options);
             yield this.builder.build(projectPath, options);
             // start
             const params = {
                 sdkHome: path_1.default.resolve(os_1.default.homedir(), '.export'),
                 avdHome: path_1.default.resolve(os_1.default.homedir(), '.android/avd'),
-                projectPath
+                projectPath,
+                compilerOption
             };
+            // 寻找对应的模拟器instance
             const goldfishInstance = (0, emulator_1.findInstance)(avdName, params);
             if (!goldfishInstance)
                 return;
             let vncPort;
+            // 设置vncPort
             if (options.openVNC) {
-                vncPort = yield portfinder_1.default.getPortPromise({ port: constants_1.defaultVncPort, stopPort: constants_1.defaultVncPort + 100 });
+                vncPort = yield portfinder_1.default.getPortPromise({
+                    port: constants_1.defaultVncPort,
+                    stopPort: constants_1.defaultVncPort + 100
+                });
+            }
+            // 设置adbPort
+            const adbPort = yield portfinder_1.default.getPortPromise({ port: constants_1.defaultAdbPort });
+            // 设置debugPort
+            let debugPort;
+            if (options.devtool) {
+                debugPort = yield portfinder_1.default.getPortPromise({ port: constants_1.defaultDebugPort });
             }
             const startOptions = {
                 avdName,
@@ -115,6 +140,8 @@ class UxStarter extends IStarter_1.default {
                 disableNSH: options.disableNSH,
                 serverPort,
                 vncPort,
+                adbPort,
+                debugPort
             };
             goldfishInstance.start(startOptions);
             // waiter
@@ -135,5 +162,25 @@ class UxStarter extends IStarter_1.default {
             // startWaiter.start()
         });
     }
+    /**
+     * 检查选择的模拟器在当前环境下是否可以使用
+     * 下面的几种情况会导致模拟器不可用：1. 模拟器绑定的Vela镜像不存在；2. Vela4.0缺少coredump.core或者vela_data.bin文件
+     * @param avdName 模拟器名称
+     * @returns {boolean}
+     */
+    isAvailableEmulator(avdName) {
+        const { avdImagePath } = VelaAvdUtils_1.default.velaAvdCls.getVelaAvdInfo(avdName);
+        // 没有avdImagePath，即对应的configIni里没有 image.sysdir.1 字段
+        // 有avdImagePath，但是这个目录下没有nuttx
+        if (!avdImagePath || !fs_extra_1.default.existsSync(path_1.default.resolve(avdImagePath, 'nuttx'))) {
+            return false;
+        }
+        if (avdImagePath.includes('vela-release') &&
+            (!fs_extra_1.default.existsSync(path_1.default.resolve(avdImagePath, 'coredump.core')) ||
+                !fs_extra_1.default.existsSync(path_1.default.resolve(avdImagePath, 'vela_data.bin')))) {
+            return false;
+        }
+        return true;
+    }
 }
 exports.default = UxStarter;

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,21 +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): string;
-    /** 根据host获取ya-vm-file-server下载地址 */
-    static getv9fsToolUrl(version?: string): string;
-    /** 获取资源文件下载地址 */
-    static getDownloadUrl(dir: string, version?: string, filename?: 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镜像是release版还是dev版
-     * @param velaImage 镜像名称或者镜像路径
+     * Vela镜像是否为zip包（是否为0.0.2版本）
+     * 只有Vela开发版（dev, 0.0.2）这个版本的镜像不是zip包
+     * @param velaImage
      * @returns
      */
-    static isReleaseVelaImage(velaImage: string): boolean;
+    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 getImageBuildTime(imageId: string): string | Date | undefined;
     /**
      * 命令行访问方式创建模拟器
      */
     static createVelaAvdByInquire(): Promise<void>;
+    /** 初始化/重置模拟器环境 */
+    static initEmulatorEnv(): Promise<void>;
 }
 export default VelaAvdUtils;

package/lib/utils/VelaAvdUtils.js

@@ -23,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`;
@@ -108,13 +110,60 @@ class VelaAvdUtils {
         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, 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 (this.isReleaseVelaImage(version)) {
-            return `${VelaAvdUtils.systemImageBaseUrl}/${version}/image.zip`;
+        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();
@@ -122,43 +171,64 @@ class VelaAvdUtils {
         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 = 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);
-                }
-                const onlineVersionInfo = constants_1.emulatorEnvVersion;
                 // avdName
                 const avdName = yield (0, prompts_1.input)({
                     message: 'avd name starting with Vela. (eg. Vela_Virtual_Device)',
@@ -167,67 +237,67 @@ 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.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 = 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'
+                        });
+                    }
                 }
-                // 镜像，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);
+                    yield VelaAvdUtils.downloadAndUnzip(emulatorDownloadUrl, VelaAvdUtils.getEmulatorEnvHome('emulator'));
+                    currVersionInfo.emulator = constants_1.EmulatorEnvVersion.emulator;
                     ColorConsole_1.default.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'] = constants_1.EmulatorEnvVersion['system-images'];
                     }
                     else {
                         yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
@@ -235,29 +305,27 @@ class VelaAvdUtils {
                     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);
+                    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);
-                    // 后续使用fatfs+adb push方式需要下载相关镜像
-                    // const imageUrl = VelaAvdUtils.getDownloadUrl('tools', onlineVersionInfo.tools, 'image')
-                    // const imageDir = path.resolve(toolsDir, 'image')
-                    // await VelaAvdUtils.downloadAndUnzip(imageUrl, imageDir)
+                    yield VelaAvdUtils.downloadFromCdn(v9fsToolUrl, VelaAvdUtils.getEmulatorEnvHome('tools'), filename);
+                    currVersionInfo.tools = constants_1.EmulatorEnvVersion.tools;
                     ColorConsole_1.default.success(`Download tools succeed.`);
                 }
-                // 替换version.json
-                const versionJson = JSON.stringify(onlineVersionInfo, null, 2);
-                fs_extra_1.default.writeFileSync(versionFile, versionJson);
+                // 下载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.`);
+                }
                 // 创建avd文本文件
                 const avdImagePath = imageDir;
                 const avdParams = { avdName, avdSkin, avdWidth, avdHeight, avdArch: emulator_1.IAvdArchType.arm, avdImagePath };
@@ -267,6 +335,92 @@ class VelaAvdUtils {
             catch (e) {
                 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);
+            }
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2-beta.1",
+  "version": "2.0.2-beta.10",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -21,24 +21,28 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/commander": "2.0.2-beta.1",
-    "@aiot-toolkit/emulator": "2.0.2-beta.1",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.1",
+    "@aiot-toolkit/commander": "2.0.2-beta.10",
+    "@aiot-toolkit/emulator": "2.0.2-beta.10",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.10",
     "@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.2-beta.1",
+    "create-aiot": "2.0.2-beta.10",
+    "dayjs": "^1.11.10",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.1",
+    "file-lane": "2.0.2-beta.10",
+    "lodash": "^4.17.21",
     "semver": "^7.6.0",
     "ws": "^8.15.1"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.4",
+    "@types/fs-extra": "^11.0.4",
     "@types/semver": "^7.5.8",
-    "@types/ws": "^8.5.10"
+    "@types/ws": "^8.5.10",
+    "fs-extra": "^11.2.0"
   },
-  "gitHead": "9244af36e617295ea4ff11a2f4f07f0e4f9f5f59"
+  "gitHead": "00d23c1ad1306a6c72bb007685de9fd4a6ee61af"
 }