aiot-toolkit 2.0.2-dev.1 → 2.0.2-dev.3

package/README.md

@@ -1,41 +1,44 @@
-# `aiot-toolkit`
+# 项目介绍
 
-> aiot-toolkit 命令行工具
+aiot-toolkit 2.0 是将 **源码项目** 转换为 **目标代码项目** 并生成 **目标代码应用** 的命令行工具，同时配备了 **模拟器** 相关功能供开发者使用。
 
-## 使用
+aiot-toolkit2.0目前支持的打包格式如下：
 
-## 贡献代码
+- ux：vela 平台下的应用，目前大量使用于小米手表、音箱等智能穿戴及物联网设备
 
-### 增加打包支持的项目
+## 安装使用
 
-1. 在`./src/builder` 中新增类文件 XBuilder，并实现 IBuilder接口
+- 全局安装
 
-```js
-import ParamType from '@aiot-toolkit/commander/lib/interface/IParam'
-import IBuild from './IBuild'
+  `npm i aiot-toolkit -g`
 
-class XBuilder implements IBuild {
-  params: ParamType[] = []
-  build(projectPath: string, options: any): void {
-    throw new Error('Method not implemented.')
-  }
-  match(projectPath: string): boolean {
-    throw new Error('Method not implemented.')
-  }
-}
-export default XBuilder
+  `npm i create-aiot -g`
 
-```
+- 创建项目
 
-2. 实现对应的方法
-3. 新增静态属性：
+  1. `create-aiot ux`
+  2. 在项目根目录执行：`npm i`
 
-```js
-static readonly PROJECT_TYPE = '项目类型的名称'
-```
+- 本机运行项目
 
-4. 在`./src/bin.ts` 的 `builderTypeList`中添加 XBuilder
+  在项目根目录执行 `aiot start`，此会启动模拟器，并运行项目
 
-```js
-const builderTypeList = [UxBuild, XtsBuild, XBuilder]
-```
+* 打包项目
+
+  在项目根目录执行 `aiot release`
+
+## 常用命令
+
+| 命令                     | 说明                     |
+| ------------------------ | ------------------------ |
+| npm create aiot          | 创建并手动选择项目       |
+| npm create aiot xts      | 创建xts项目              |
+| npm create aiot ux       | 创建ux项目               |
+| aiot build               | 构建项目                 |
+| aiot release             | 构建项目-release模式     |
+| aiot start               | 构建项目并运行到模拟器   |
+| aiot getConnectedDevices | 获取已连接设备列表       |
+| aiot getPlatforms        | 获取设置平台             |
+| aiot installDbgAndMkp    | 在真机上安装快应用调试器 |
+| aiot createVelaAvd       | 创建 vela 模拟器         |
+| aiot deleteVelaAvd       | 删除 vela 模拟器         |

package/lib/bin.js

@@ -64,7 +64,7 @@ function getProjectType() {
     else if (isXts) {
         return "xts" /* ProjectType.XTS */;
     }
-    ColorConsole_1.default.throw(`Unsupported project type`);
+    return "ux" /* ProjectType.UX */;
 }
 function findStarter(command, description) {
     const projectType = getProjectType();
@@ -75,7 +75,7 @@ function main() {
         const config = {
             name: 'aiot-toolkit',
             description: 'contains build, dev, release, etc. commands for aiot toolkit',
-            version: '2.0.1',
+            version: require('../package.json').version,
             commandList: [
                 build('build', 'build project'),
                 build('release', 'release the project'),

package/lib/interface/VelaEmulatorInterface.d.ts

@@ -1,7 +1,12 @@
+export interface ISystemImagesVersionInfo {
+    release: string;
+    dev: string;
+}
+export type ISystemImagesType = keyof ISystemImagesVersionInfo;
 export interface IGoldfishVersionInfo {
     name: string;
     emulator: string;
-    'system-images': string;
+    'system-images': ISystemImagesVersionInfo;
     qa: string;
     skins: string;
     tools: string;

package/lib/utils/VelaAvdUtils.d.ts

@@ -26,7 +26,7 @@ declare class VelaAvdUtils {
     /** 根据host获取模拟器下载地址 */
     static getEmulatorUrl(version?: string): string;
     /** 根据host获取vela镜像下载地址 */
-    static getSystemImageUrl(version?: string, device?: string): string;
+    static getSystemImageUrl(version?: string): string;
     /** 根据host获取ya-vm-file-server下载地址 */
     static getv9fsToolUrl(version?: string): string;
     /** 获取资源文件下载地址 */

package/lib/utils/VelaAvdUtils.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const emulator_1 = require("@aiot-toolkit/emulator");
+const constants_1 = require("@aiot-toolkit/emulator/lib/static/constants");
 const utils_1 = require("@aiot-toolkit/emulator/lib/utils");
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const prompts_1 = require("@inquirer/prompts");
@@ -108,8 +109,8 @@ class VelaAvdUtils {
         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`;
+    static getSystemImageUrl(version = 'vela-release-4.0') {
+        return `${VelaAvdUtils.systemImageBaseUrl}/${version}/nuttx`;
     }
     /** 根据host获取ya-vm-file-server下载地址 */
     static getv9fsToolUrl(version = '0.0.1') {
@@ -146,10 +147,7 @@ class VelaAvdUtils {
                 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);
+                const onlineVersionInfo = constants_1.emulatorEnvVersion;
                 // avdName
                 const avdName = yield (0, prompts_1.input)({
                     message: 'avd name starting with Vela. (eg. Vela_Virtual_Device)',
@@ -197,9 +195,12 @@ class VelaAvdUtils {
                     });
                 }
                 // 镜像，TODO：后续需要考虑多种设备的镜像
-                const avdArch = (yield (0, prompts_1.select)({
+                const velaImage = (yield (0, prompts_1.select)({
                     message: 'vela image.',
-                    choices: [{ value: 'arm' }, { value: 'arm64' }]
+                    choices: [
+                        // { value: 'vela-release-4.0', 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');
@@ -210,11 +211,10 @@ class VelaAvdUtils {
                     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 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 ||
-                    (versionInfo && versionInfo['system-images'] < onlineVersionInfo['system-images'])) {
+                if (!imageExists) {
                     yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
                     ColorConsole_1.default.success(`Download vela image succeed.`);
                 }
@@ -240,13 +240,11 @@ class VelaAvdUtils {
                     ColorConsole_1.default.success(`Download tools succeed.`);
                 }
                 // 替换version.json
-                if (versionFileExist) {
-                    fs_extra_1.default.rmSync(versionFile);
-                }
-                fs_extra_1.default.renameSync(onlineVersionFile, versionFile);
+                const versionJson = JSON.stringify(onlineVersionInfo, null, 2);
+                fs_extra_1.default.writeFileSync(versionFile, versionJson);
                 // 创建avd文本文件
                 const avdImagePath = imageDir;
-                const avdParams = { avdName, avdSkin, avdWidth, avdHeight, avdArch, avdImagePath };
+                const avdParams = { avdName, avdSkin, avdWidth, avdHeight, avdArch: emulator_1.IAvdArchType.arm, avdImagePath };
                 VelaAvdUtils.velaAvdCls.createVelaAvd(avdParams);
                 ColorConsole_1.default.success(`Create avd succeed.`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2-dev.1",
+  "version": "2.0.2-dev.3",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -17,30 +17,26 @@
   "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/commander": "2.0.2-dev.1",
-    "@aiot-toolkit/emulator": "2.0.2-dev.1",
-    "@aiot-toolkit/shared-utils": "2.0.2-dev.1",
+    "@aiot-toolkit/commander": "2.0.2-dev.3",
+    "@aiot-toolkit/emulator": "2.0.2-dev.3",
+    "@aiot-toolkit/shared-utils": "2.0.2-dev.3",
     "@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-dev.1",
+    "create-aiot": "2.0.2-dev.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-dev.1",
+    "file-lane": "2.0.2-dev.3",
     "ws": "^8.15.1"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.4",
     "@types/ws": "^8.5.10"
   },
-  "gitHead": "0beecc786c41b73ab2dabeaad06fb4ad19115f4b"
+  "gitHead": "e143a7038d5efaa59f01b2e2eb98422b1ec01097"
 }