aiot-toolkit 2.0.1-alpha.9 → 2.0.2-beta.10

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-beta.10",
   "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-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.1-alpha.9",
-    "fast-glob": "^3.3.2"
+    "create-aiot": "2.0.2-beta.10",
+    "dayjs": "^1.11.10",
+    "fast-glob": "^3.3.2",
+    "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/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": "00d23c1ad1306a6c72bb007685de9fd4a6ee61af"
 }

package/lib/bin.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["bin.ts"],"names":[],"mappings":"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","file":"bin.js","sourcesContent":["#!/usr/bin/env node\n\nimport { Command, ICommand, IProgram } from '@aiot-toolkit/commander'\nimport { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport { getAiotCreateCommand } from 'create-aiot'\nimport IBuilder from './builder/IBuilder'\nimport XtsBuilder from './builder/XtsBuilder'\nimport GoldfishStarter from './starter/GoldfishStarter'\nimport DeviceUtil from './utils/DeviceUtil'\nimport VelaAvdUtil from './utils/VelaAvdUtils'\nimport waiter from './waiter'\n// 配置支持的 builder 类型，新增的项目类型，只需在此处加上类型\n\nfunction findBuilder(projectPath: string): IBuilder | undefined {\n  return new XtsBuilder()\n}\n\nfunction build(command: string, description: string): ICommand {\n  const projectPath = process.cwd()\n  const builder = findBuilder(projectPath)\n  const paramList = builder?.params\n\n  return {\n    name: command,\n    description,\n    paramList,\n    action: async (option: any) => {\n      // 获取对应的 build；如果存在，执行 build 函数，不存在，提示\n      const projectPath = process.cwd()\n      const builder = findBuilder(projectPath)\n      if (builder) {\n        const { watch } = option\n        await builder.build(projectPath, option)\n        if (watch) {\n          waiter.describe()\n          waiter.start()\n        }\n      } else {\n        ColorConsole.log({\n          message: `This type of project is not currently supported. The supported projects : xts`,\n          level: LOG_LEVEL.Error,\n          isOnlyPrintError: true\n        })\n      }\n    }\n  }\n}\n\nasync function main() {\n  const aiotCreate = await getAiotCreateCommand()\n  const config: IProgram = {\n    name: 'aiot-toolkit',\n    description: 'contains build, dev, release, etc. commands for aiot toolkit',\n    version: '2.0.1',\n    commandList: [\n      build('build', 'build project'),\n      new GoldfishStarter('start', 'start project').getParamList(),\n      {\n        name: 'getConnectedDevices',\n        description: 'get all connected devices',\n        action: async (option) => {\n          try {\n            const connectedDevices = await DeviceUtil.getAllConnectedDevices()\n            ColorConsole.log({\n              message: `The connected devices are: ${\n                connectedDevices ? connectedDevices.join(', ') : 'null'\n              }`\n            })\n          } catch (error) {\n            ColorConsole.log({ message: (error as Error).message, level: LOG_LEVEL.Error })\n          }\n        }\n      },\n      {\n        name: 'getPlatforms',\n        description: 'get available platform(s) on selected device',\n        paramList: [\n          {\n            name: 'ip',\n            description: 'device ip(eg 127.0.0.1)',\n            type: 'string',\n            enableInquirer: true\n          },\n          {\n            name: 'port',\n            description: 'device port(eg 39517)',\n            type: 'string',\n            enableInquirer: true\n          },\n          {\n            name: 'sn',\n            description:\n              'view the serial number of the connected device through the \"adb devices\" command, if it is a device connected via wifi, the format is \"ip address:5555\"',\n            type: 'string',\n            enableInquirer: true\n          }\n        ],\n        action: async (option) => {\n          await DeviceUtil.getAvailablePlatform(option)\n        }\n      },\n      {\n        name: 'installDbgAndMkp',\n        description: 'install \"org.hapjs.debugger\" & \"org.hapjs.mockup\" ',\n        paramList: [\n          {\n            name: 'ip',\n            description: 'device ip(eg 127.0.0.1)',\n            type: 'string'\n          },\n          {\n            name: 'port',\n            description: 'device ip(eg 5555)',\n            type: 'string'\n          }\n        ],\n        action: async (option) => {\n          try {\n            const successMessage = await DeviceUtil.installDbgAndMkp(option)\n            ColorConsole.log({ message: successMessage, level: LOG_LEVEL.Success })\n          } catch (error) {\n            ColorConsole.log({ message: (error as Error).message, level: LOG_LEVEL.Error })\n          }\n        }\n      },\n      {\n        name: 'createVelaAvd',\n        description: 'create a vela avd instance',\n        action: async () => {\n          VelaAvdUtil.createVelaAvdByInquire()\n        }\n      },\n      {\n        ...aiotCreate,\n        name: 'create',\n        description: 'create aiot project'\n      }\n    ]\n  }\n  Command.registeProgram(config)\n}\nmain()\n"],"sourceRoot":"../src"}

package/lib/builder/IBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["builder/IBuilder.ts"],"names":[],"mappings":"","file":"IBuilder.js","sourcesContent":["import { IParam } from '@aiot-toolkit/commander'\n\n/**\n * IBuilder\n */\nexport default interface IBuilder<O = any> {\n  /**\n   * build 的参数列表\n   */\n  readonly params: IParam[]\n\n  /**\n   * 打包项目\n   * @param projectPath 项目路径\n   * @param options 命令参数\n   * @param watch 是否监听文件变化并持续打包\n   */\n  build(projectPath: string, options: O): void | Promise<void>\n\n  /**\n   * 当前 builder 是否可打包指定目录的项目\n   * @param projectPath 项目目录\n   */\n  match(projectPath: string): boolean\n}\n"],"sourceRoot":"../../src"}

package/lib/builder/UxBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["builder/UxBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uGAA8E;AAC9E,mJAA0H;AAE1H,0FAAiE;AAGjE,iGAAwE;AAExE,yCAAoC;AACpC,wDAAyB;AACzB,oDAA2B;AAC3B,gDAAuB;AAQvB;;GAEG;AACH,MAAM,SAAS;IAAf;QACW,oBAAe,GAAG,oBAAoB,CAAA;QA0D/C,WAAM,GAAgB;YACpB;gBACE,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,uCAAuC;aACrD;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,mBAAmB;aACjC;YACD;gBACE,IAAI,EAAE,qBAAqB;gBAC3B,WAAW,EAAE,qBAAqB;aACnC;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,cAAc;gBACpB,WAAW,EAAE,qBAAqB;gBAClC,YAAY,EAAE,IAAI;gBAClB,cAAc,EAAE,IAAI;aACrB;SACF,CAAA;IAKH,CAAC;IAlFC;;;;;OAKG;IACG,KAAK,CAAC,WAAmB,EAAE,OAAyB;;YACxD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;YACzB,aAAa;YACb,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;YAC3D,OAAO,GAAG,gBAAM,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,GAAG,CAAC,CAAA;YACxD,OAAO;YACP,MAAM,eAAe,GAAa,IAAI,kBAAQ,CAAC,WAAW,CAAC,CAAA;YAE3D,OAAO;YACP,MAAM,cAAc,GAAsC,gBAAM,CAAC,KAAK,CACpE;gBACE,WAAW,EAAE,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,MAAM,CAAC;gBAC3D,IAAI,EAAE,qBAAW,CAAC,WAAW;gBAC7B,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,EACD,wCAA8B,EAC9B,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,CACxB,CAAA;YAED,uBAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,IAAI,CAAC,SAAS,CAClB;oBACE,IAAI,EAAE,UAAU;oBAChB,WAAW;oBACX,OAAO;oBACP,KAAK;iBACN,EACD,IAAI,EACJ,CAAC,CACF;aACF,CAAC,CAAA;YACF,SAAS;YACT,MAAM,IAAI,oBAAQ,CAChB,eAAe,EACf,WAAW,EACX,cAA0C,CAC3C,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;QACpB,CAAC;KAAA;IAEO,kBAAkB,CAAC,WAAmB;QAC5C,MAAM,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;QACzD,IAAI,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvB,IAAI;gBACF,OAAO,kBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;aAC7B;YAAC,OAAO,KAAK,EAAE;gBACd,uBAAa,CAAC,KAAK,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC,CAAA;aAC7C;SACF;QACD,OAAM;IACR,CAAC;IAwBD,KAAK,CAAC,WAAmB;QACvB,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;;AAzBe,sBAAY,GAAG,cAAH,AAAiB,CAAA;AA2B/C,kBAAe,SAAS,CAAA","file":"UxBuilder.js","sourcesContent":["import CompileMode from '@aiot-toolkit/aiotpack/lib/compiler/enum/CompileMode'\nimport JavascriptDefaultCompileOption from '@aiot-toolkit/aiotpack/lib/compiler/javascript/JavascriptDefaultCompileOption'\nimport IJavascriptCompileOption from '@aiot-toolkit/aiotpack/lib/compiler/javascript/interface/IJavascriptCompileOption'\nimport UxConfig from '@aiot-toolkit/aiotpack/lib/config/UxConfig'\nimport IQuickAppConfig from '@aiot-toolkit/aiotpack/src/compiler/javascript/vela/interface/IQuickAppConfig'\nimport ParamType from '@aiot-toolkit/commander/lib/interface/IParam'\nimport ColorConsole2 from '@aiot-toolkit/shared-utils/lib/ColorConsole2'\nimport { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type'\nimport { FileLane } from 'file-lane'\nimport Fs from 'fs-extra'\nimport Lodash from 'lodash'\nimport Path from 'path'\nimport IBuilder from './IBuilder'\n\ninterface IUxBuilderOption extends Dictionary {\n  watch?: boolean\n  mode: CompileMode\n}\n\n/**\n * UxBuilder\n */\nclass UxBuilder implements IBuilder<IUxBuilderOption> {\n  readonly QUICKAPP_CONFIG = 'quickapp.config.js'\n  /**\n   * ux项目的build函数\n   * @param projectPath 项目路径\n   * @param options 命令参数\n   * @param watch 是否开启监听\n   */\n  async build(projectPath: string, options: IUxBuilderOption): Promise<void> {\n    const { watch } = options\n    // 读取项目中文件的配置\n    const quickappConfig = this.readQuickAppConfig(projectPath)\n    options = Lodash.merge({}, options, quickappConfig?.cli)\n    // 项目配置\n    const uxProjectConfig: UxConfig = new UxConfig(projectPath)\n\n    // 编译配置\n    const compilerOption: Partial<IJavascriptCompileOption> = Lodash.merge(\n      {\n        projectPath: Path.join(projectPath, uxProjectConfig.output),\n        mode: CompileMode.DEVELOPMENT,\n        disabledJSC: options.disabledJsc\n      },\n      JavascriptDefaultCompileOption,\n      quickappConfig?.webpack\n    )\n\n    ColorConsole2.info({\n      word: JSON.stringify(\n        {\n          step: 'build ux',\n          projectPath,\n          options,\n          watch\n        },\n        null,\n        2\n      )\n    })\n    // 开始编译项目\n    await new FileLane<IJavascriptCompileOption>(\n      uxProjectConfig,\n      projectPath,\n      compilerOption as IJavascriptCompileOption\n    ).start({ watch })\n  }\n\n  private readQuickAppConfig(projectPath: string): IQuickAppConfig | undefined {\n    const path = Path.join(projectPath, this.QUICKAPP_CONFIG)\n    if (Fs.existsSync(path)) {\n      try {\n        return Fs.readJsonSync(path)\n      } catch (error) {\n        ColorConsole2.throw(error?.toString() || '')\n      }\n    }\n    return\n  }\n  static readonly PROJECT_TYPE = 'ux quick app'\n  params: ParamType[] = [\n    {\n      name: 'enable-e2e',\n      description: 'inject test-suite for current project'\n    },\n    {\n      name: 'devtool',\n      description: 'source map config'\n    },\n    {\n      name: 'disable-subpackages',\n      description: 'disable subpackages'\n    },\n    {\n      type: 'confirm',\n      name: 'disabled-jsc',\n      description: 'disabled jsc bundle',\n      defaultValue: true,\n      enableInquirer: true\n    }\n  ]\n\n  match(projectPath: string): boolean {\n    return projectPath.includes('ux')\n  }\n}\nexport default UxBuilder\n"],"sourceRoot":"../../src"}

package/lib/builder/XtsBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["builder/XtsBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qDAAkD;AAKlD,0FAA+E;AAG/E,6DAAsD;AACtD,+FAAsE;AACtE,iGAAwE;AACxE,yCAAoC;AACpC,4CAAmB;AACnB,gDAAuB;AAQvB;;GAEG;AACH,MAAM,UAAU;IAAhB;QA4BW,WAAM,GAAa;YAC1B;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,QAAQ;gBACd,WAAW,EACT,0JAA0J;gBAC5J,QAAQ,CAAC,KAAa;oBACpB,sBAAsB;oBACtB,MAAM,GAAG,GAAG,oBAAU,CAAC,mBAAmB,CAAC,KAAK,CAAqB,CAAA;oBACrE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;wBAC7B,OAAO,CAAC,0BAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oBAC9B,CAAC,CAAC,CAAA;oBAEF,IAAI,OAAO,EAAE;wBACX,OAAO,GAAG,OAAO,uCAAuC,0BAAQ,CAAC,IAAI,CACnE,GAAG,CACJ,uCAAuC,CAAA;qBACzC;oBACD,OAAO,IAAI,CAAA;gBACb,CAAC;aACF;SACF,CAAA;IACH,CAAC;IA/CC,KAAK,CAAC,WAAmB;QACvB,wBAAwB;QACxB,OAAO,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAA;IAChE,CAAC;IAEK,KAAK,CAAC,WAAmB,EAAE,OAAuB;;YACtD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;YACzB,sBAAY,CAAC,GAAG,CAAC;gBACf,OAAO,EAAE,IAAI,CAAC,SAAS,CACrB;oBACE,WAAW;oBACX,OAAO;iBACR,EACD,SAAS,EACT,CAAC,CACF;gBACD,KAAK,EAAE,wBAAS,CAAC,OAAO;aACzB,CAAC,CAAA;YACF,MAAM,eAAe,GAAuB;gBAC1C,IAAI,EAAE,oBAAU,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAyB;aAC3E,CAAA;YACD,MAAM,MAAM,GAAG,IAAI,oBAAS,EAAE,CAAA;YAC9B,OAAO,IAAI,oBAAQ,CAAqB,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;QAChG,CAAC;KAAA;;AAzBe,uBAAY,GAAG,eAAH,AAAkB,CAAA;AAkDhD,kBAAe,UAAU,CAAA","file":"XtsBuilder.js","sourcesContent":["import { XtsConfig } from '@aiot-toolkit/aiotpack'\nimport type {\n  ISkipList,\n  IXtsCompileOptions\n} from '@aiot-toolkit/aiotpack/lib/interface/ICompileOptions'\nimport { skipList } from '@aiot-toolkit/aiotpack/lib/interface/ICompileOptions'\n\nimport { IParam } from '@aiot-toolkit/commander'\nimport { LOG_LEVEL } from '@aiot-toolkit/shared-utils'\nimport ColorConsole from '@aiot-toolkit/shared-utils/lib/ColorConsole'\nimport StringUtil from '@aiot-toolkit/shared-utils/lib/utils/StringUtil'\nimport { FileLane } from 'file-lane'\nimport fs from 'fs'\nimport path from 'path'\nimport IBuilder from './IBuilder'\n\nexport interface IBuilderOption {\n  watch?: boolean\n  skip?: string\n}\n\n/**\n * XtsBuilder\n */\nclass XtsBuilder implements IBuilder<IBuilderOption> {\n  static readonly PROJECT_TYPE = 'xts quick app'\n\n  match(projectPath: string): boolean {\n    // app/app.xts 存在视为xts项目\n    return fs.existsSync(path.resolve(projectPath, 'app/app.xts'))\n  }\n\n  async build(projectPath: string, options: IBuilderOption) {\n    const { watch } = options\n    ColorConsole.log({\n      message: JSON.stringify(\n        {\n          projectPath,\n          options\n        },\n        undefined,\n        2\n      ),\n      level: LOG_LEVEL.Success\n    })\n    const compilerOptions: IXtsCompileOptions = {\n      skip: StringUtil.string2arrayByComma(options.skip) as unknown as ISkipList\n    }\n    const config = new XtsConfig()\n    return new FileLane<IXtsCompileOptions>(config, projectPath, compilerOptions).start({ watch })\n  }\n\n  readonly params: IParam[] = [\n    {\n      name: 'skip',\n      type: 'string',\n      description:\n        'Can configure skip steps, comma separated, optional values: install (skip install pre-dependencies),ts2wasm (skip compilation), package (skip packaging)',\n      validate(value: string) {\n        // TODO: validate 不起作用\n        const res = StringUtil.string2arrayByComma(value) as any as ISkipList\n        const unValid = res.find((r) => {\n          return !skipList.includes(r)\n        })\n\n        if (unValid) {\n          return `${unValid} is unvalidate,  validate value are ${skipList.join(\n            ','\n          )}, Multiple values separated by commas`\n        }\n        return true\n      }\n    }\n  ]\n}\nexport default XtsBuilder\n"],"sourceRoot":"../../src"}

package/lib/interface/CommandInterface.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["interface/CommandInterface.ts"],"names":[],"mappings":"","file":"CommandInterface.js","sourcesContent":["/**\n * IInstallApkAndDbg\n */\nexport interface IInstallApkAndDbg {\n  ip?: string\n  port?: string\n  platform?: string\n  apkVersion?: string\n  forceInstall?: boolean\n}\nexport interface IGetAvailablePlatform {\n  ip: string\n  port: string\n  sn: string\n}\n"],"sourceRoot":"../../src"}

package/lib/interface/VelaEmulatorInterface.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["interface/VelaEmulatorInterface.ts"],"names":[],"mappings":"","file":"VelaEmulatorInterface.js","sourcesContent":["export interface IGoldfishVersionInfo {\n  name: string;\n  emulator: string;\n  'system-images': string;\n  qa: string;\n  skins: string;\n  tools: string;\n}"],"sourceRoot":"../../src"}

package/lib/starter/GoldfishStarter.d.ts

@@ -1,9 +0,0 @@
-import { ICommand } from '@aiot-toolkit/commander';
-declare class GoldfishStarter {
-    private name;
-    private description;
-    constructor(name: string, description: string);
-    getParamList(): ICommand;
-    start(option: any): Promise<void>;
-}
-export default GoldfishStarter;