aiot-toolkit 2.0.2-dev.2 → 2.0.2-dev.4

package/README.md

@@ -5,7 +5,6 @@ aiot-toolkit 2.0 是将 **源码项目** 转换为 **目标代码项目** 并生
 aiot-toolkit2.0目前支持的打包格式如下：
 
 - ux：vela 平台下的应用，目前大量使用于小米手表、音箱等智能穿戴及物联网设备
-- xts：新一代vela应用
 
 ## 安装使用
 
@@ -32,8 +31,9 @@ aiot-toolkit2.0目前支持的打包格式如下：
 
 | 命令                     | 说明                     |
 | ------------------------ | ------------------------ |
-| create-aiot xts          | 创建xts项目              |
-| create-aiot ux           | 创建ux项目               |
+| npm create aiot          | 创建并手动选择项目       |
+| npm create aiot xts      | 创建xts项目              |
+| npm create aiot ux       | 创建ux项目               |
 | aiot build               | 构建项目                 |
 | aiot release             | 构建项目-release模式     |
 | aiot start               | 构建项目并运行到模拟器   |
@@ -42,9 +42,3 @@ aiot-toolkit2.0目前支持的打包格式如下：
 | aiot installDbgAndMkp    | 在真机上安装快应用调试器 |
 | aiot createVelaAvd       | 创建 vela 模拟器         |
 | aiot deleteVelaAvd       | 删除 vela 模拟器         |
-
-## 参考
-
-> [贡献代码](./doc/贡献代码.md) >
-
-> [ux解析流程](./doc/ux解析流程.md)

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'),
@@ -158,15 +158,15 @@ function main() {
                     })
                 },
                 {
-                    name: 'createVelaAvd',
-                    description: 'create a vela avd instance',
+                    name: 'createVVD',
+                    description: 'create a vela virtual device',
                     action: () => __awaiter(this, void 0, void 0, function* () {
                         VelaAvdUtils_1.default.createVelaAvdByInquire();
                     })
                 },
                 {
-                    name: 'deleteVelaAvd',
-                    description: 'delete vela avd instance(s)',
+                    name: 'deleteVVD',
+                    description: 'delete vela virtual device(s)',
                     paramList: [
                         {
                             name: 'avdNames',

package/lib/starter/IStarter.d.ts

@@ -2,7 +2,7 @@ import { ICommand, IParam } from '@aiot-toolkit/commander';
 /**
  * IStarter
  */
-export default class IStarter<O = any> {
+export default abstract class IStarter<O = any> {
     protected name: string;
     protected description: string;
     /**
@@ -19,5 +19,5 @@ export default class IStarter<O = any> {
      * @param projectPath 项目路径
      * @param options 命令参数
      */
-    start(projectPath: string, options: O): void | Promise<void>;
+    abstract start(projectPath: string, options: O): void | Promise<void>;
 }

package/lib/starter/IStarter.js

@@ -35,11 +35,5 @@ class IStarter {
             })
         };
     }
-    /**
-     * 运行项目
-     * @param projectPath 项目路径
-     * @param options 命令参数
-     */
-    start(projectPath, options) { }
 }
 exports.default = IStarter;

package/lib/starter/UxStarter.js

@@ -97,11 +97,14 @@ class UxStarter extends IStarter_1.default {
             // build
             yield this.builder.build(projectPath, options);
             // start
-            const goldfishInstance = new emulator_1.GoldfishInstance({
+            const params = {
                 sdkHome: path_1.default.resolve(os_1.default.homedir(), '.export'),
                 avdHome: path_1.default.resolve(os_1.default.homedir(), '.android/avd'),
                 projectPath
-            });
+            };
+            const goldfishInstance = (0, emulator_1.findInstance)(avdName, params);
+            if (!goldfishInstance)
+                return;
             let vncPort;
             if (options.openVNC) {
                 vncPort = yield portfinder_1.default.getPortPromise({ port: constants_1.defaultVncPort, stopPort: constants_1.defaultVncPort + 100 });

package/lib/starter/XtsStarter.d.ts

@@ -1,6 +1,6 @@
-import ParamType from "@aiot-toolkit/commander/lib/interface/IParam";
-import XtsBuilder from "../builder/XtsBuilder";
-import IStarter from "./IStarter";
+import ParamType from '@aiot-toolkit/commander/lib/interface/IParam';
+import XtsBuilder from '../builder/XtsBuilder';
+import IStarter from './IStarter';
 declare class XtsStarter extends IStarter {
     builder: XtsBuilder;
     params: ParamType[];

package/lib/starter/XtsStarter.js

@@ -11,6 +11,9 @@ class XtsStarter extends IStarter_1.default {
         this.builder = new XtsBuilder_1.default();
         this.params = [];
     }
-    start(projectPath, options) { }
+    start(projectPath, options) {
+        console.log(projectPath, options);
+        throw new Error('Method not implemented.');
+    }
 }
 exports.default = XtsStarter;

package/lib/utils/VelaAvdUtils.d.ts

@@ -31,6 +31,12 @@ declare class VelaAvdUtils {
     static getv9fsToolUrl(version?: string): string;
     /** 获取资源文件下载地址 */
     static getDownloadUrl(dir: string, version?: string, filename?: string): string;
+    /**
+     * 判断vela镜像是release版还是dev版
+     * @param velaImage 镜像名称或者镜像路径
+     * @returns
+     */
+    static isReleaseVelaImage(velaImage: string): boolean;
     /**
      * 命令行访问方式创建模拟器
      */

package/lib/utils/VelaAvdUtils.js

@@ -110,6 +110,9 @@ class VelaAvdUtils {
     }
     /** 根据host获取vela镜像下载地址 */
     static getSystemImageUrl(version = 'vela-release-4.0') {
+        if (this.isReleaseVelaImage(version)) {
+            return `${VelaAvdUtils.systemImageBaseUrl}/${version}/image.zip`;
+        }
         return `${VelaAvdUtils.systemImageBaseUrl}/${version}/nuttx`;
     }
     /** 根据host获取ya-vm-file-server下载地址 */
@@ -135,6 +138,14 @@ class VelaAvdUtils {
     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');
+    }
     /**
      * 命令行访问方式创建模拟器
      */
@@ -198,7 +209,7 @@ class VelaAvdUtils {
                 const velaImage = (yield (0, prompts_1.select)({
                     message: 'vela image.',
                     choices: [
-                        // { value: 'vela-release-4.0', name: 'vela正式版（4.0）' },
+                        // { value: 'vela-release-4.0-pre', name: 'vela抢先版（4.0）' },
                         { value: 'vela-dev-0.0.2', name: 'vela开发版（dev, 0.0.2）' }
                     ]
                 }));
@@ -215,7 +226,12 @@ class VelaAvdUtils {
                 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) {
-                    yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
+                    if (this.isReleaseVelaImage(velaImage)) {
+                        yield VelaAvdUtils.downloadAndUnzip(velaImageDownloadUrl, imageDir);
+                    }
+                    else {
+                        yield VelaAvdUtils.downloadFromCdn(velaImageDownloadUrl, imageDir, 'nuttx');
+                    }
                     ColorConsole_1.default.success(`Download vela image succeed.`);
                 }
                 // 下载快应用qa文件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2-dev.2",
+  "version": "2.0.2-dev.4",
   "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.2",
-    "@aiot-toolkit/emulator": "2.0.2-dev.2",
-    "@aiot-toolkit/shared-utils": "2.0.2-dev.2",
+    "@aiot-toolkit/commander": "2.0.2-dev.4",
+    "@aiot-toolkit/emulator": "2.0.2-dev.4",
+    "@aiot-toolkit/shared-utils": "2.0.2-dev.4",
     "@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.2",
+    "create-aiot": "2.0.2-dev.4",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-dev.2",
+    "file-lane": "2.0.2-dev.4",
     "ws": "^8.15.1"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.4",
     "@types/ws": "^8.5.10"
   },
-  "gitHead": "4979839c27a3477f7e72f1f1ed167200bc1d48b5"
+  "gitHead": "534fdc7c6f018623c05499bf9add8db813ef8660"
 }