aiot-toolkit 2.0.2-beta.4 → 2.0.2-beta.6

package/lib/builder/UxBuilder.js

@@ -66,6 +66,18 @@ class UxBuilder {
                 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
             }
         ];
     }

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) {
@@ -104,19 +115,30 @@ class UxStarter extends IStarter_1.default {
                 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 });
             }
+            // 设置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,
                 devtool: options.devtool,
                 disableNSH: options.disableNSH,
                 serverPort,
                 vncPort,
+                adbPort,
+                debugPort
             };
             goldfishInstance.start(startOptions);
             // waiter
@@ -137,5 +159,24 @@ 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('0.0.2') &&
+            (!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上下载资源文件
@@ -27,10 +28,20 @@ declare class VelaAvdUtils {
     static getEmulatorUrl(version?: string): string;
     /** 获取模拟器平台的名称，darwin-aarch64 linux-aarch64 windows-x86_64等 */
     static getEmulatorPlatform(): string;
+    /** 获取各项模拟器资源的根目录 */
     static getEmulatorEnvHome(resourceName: string): string;
-    /** vela镜像需要更新 */
+    /**
+     * Vela镜像需要更新
+     * @param imageId 镜像id
+     * @returns {boolean}
+     */
     static velaImageNeedUpdate(imageId: string): boolean;
-    /** vela镜像是否为zip包 */
+    /**
+     * 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;

package/lib/utils/VelaAvdUtils.js

@@ -25,6 +25,7 @@ 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`;
@@ -116,16 +117,24 @@ class VelaAvdUtils {
         const hostOs = systemOs === 'win32' ? 'windows' : systemOs;
         return `${hostOs}-${hostArch}`;
     }
+    /** 获取各项模拟器资源的根目录 */
     static getEmulatorEnvHome(resourceName) {
         return path_1.default.resolve(VelaAvdUtils.sdkHome, resourceName);
     }
-    /** vela镜像需要更新 */
+    /**
+     * Vela镜像需要更新
+     * @param imageId 镜像id
+     * @returns {boolean}
+     */
     static velaImageNeedUpdate(imageId) {
         // 兼容之前的version.json
-        if (typeof imageId !== 'string')
+        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) && VelaAvdUtils.isZipInImageUrl(imageId)) {
+        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'))
@@ -133,7 +142,12 @@ class VelaAvdUtils {
         }
         return false;
     }
-    /** vela镜像是否为zip包 */
+    /**
+     * Vela镜像是否为zip包（是否为0.0.2版本）
+     * 只有Vela开发版（dev, 0.0.2）这个版本的镜像不是zip包
+     * @param velaImage
+     * @returns
+     */
     static isZipInImageUrl(velaImage) {
         return velaImage.indexOf('0.0.2') < 0;
     }
@@ -278,26 +292,18 @@ class VelaAvdUtils {
                     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.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.`);
                 }
-                else {
-                    // 镜像版本过低
-                    if (VelaAvdUtils.isZipInImageUrl(velaImage) && VelaAvdUtils.velaImageNeedUpdate(velaImage)) {
-                        yield VelaAvdUtils.downloadAndUnzip(velaImageDownloadUrl, imageDir);
-                        ColorConsole_1.default.success(`Download vela image succeed.`);
-                    }
-                }
                 // 下载快应用qa文件
                 if (!qaExist || (currVersionInfo && currVersionInfo.qa < onlineVersionInfo.qa)) {
                     const qaUrl = VelaAvdUtils.getDownloadUrl('qa', onlineVersionInfo.qa);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2-beta.4",
+  "version": "2.0.2-beta.6",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -21,25 +21,28 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/commander": "2.0.2-beta.4",
-    "@aiot-toolkit/emulator": "2.0.2-beta.4",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.4",
+    "@aiot-toolkit/commander": "2.0.2-beta.6",
+    "@aiot-toolkit/emulator": "2.0.2-beta.6",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.6",
     "@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.4",
+    "create-aiot": "2.0.2-beta.6",
     "dayjs": "^1.11.10",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.4",
+    "file-lane": "2.0.2-beta.6",
+    "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": "656add8e64d8101b9f3886957c5b9ae23e2e854f"
+  "gitHead": "b9b99afff176075380c2ec95b43797d696c393c1"
 }