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

package/lib/starter/UxStarter.d.ts

@@ -1,10 +1,22 @@
-import ParamType from '@aiot-toolkit/commander/lib/interface/IParam';
+import { IParam } from '@aiot-toolkit/commander';
 import { IStartOptions } from '@aiot-toolkit/emulator';
 import UxBuilder from '../builder/UxBuilder';
 import IStarter from './IStarter';
+/**
+ * UxStarter
+ * ux快应用启动器
+ */
 declare class UxStarter extends IStarter<IStartOptions> {
+    private ws;
     builder: UxBuilder;
-    params: ParamType[];
+    params: IParam[];
     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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,10 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const JavascriptDefaultCompileOption_1 = __importStar(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/JavascriptDefaultCompileOption"));
+const aiotpack_1 = require("@aiot-toolkit/aiotpack");
 const emulator_1 = require("@aiot-toolkit/emulator");
 const constants_1 = require("@aiot-toolkit/emulator/lib/static/constants");
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const index_1 = require("@aiot-toolkit/emulator/lib/utils/index");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const prompts_1 = require("@inquirer/prompts");
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -46,10 +24,23 @@ 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"));
+const ws_1 = __importDefault(require("ws"));
+/**
+ * UxStarter
+ * ux快应用启动器
+ */
 class UxStarter extends IStarter_1.default {
     constructor() {
         super(...arguments);
-        this.builder = new UxBuilder_1.default();
+        this.builder = new UxBuilder_1.default({
+            onBuildSuccess: () => {
+                var _a;
+                (_a = this.ws) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+                    type: 'restart'
+                }));
+            }
+        });
         this.params = [
             {
                 name: 'disableNSH',
@@ -74,49 +65,89 @@ class UxStarter extends IStarter_1.default {
     }
     start(projectPath, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            // 获取已经创建的模拟器列表
             const avdList = VelaAvdUtils_1.default.velaAvdCls.getVelaAvdList();
+            let avdName;
             if (avdList.length === 0) {
-                ColorConsole_1.default.error('### goldfish start ### No vela emulator available, please create it first.');
+                shared_utils_1.ColorConsole.error('no vela emulator available, please create it first.');
                 VelaAvdUtils_1.default.createVelaAvdByInquire();
                 return;
             }
-            const avdName = yield (0, prompts_1.select)({
-                message: 'name of the avd to start',
-                choices: avdList.map((item) => {
-                    return { value: item.avdName };
-                })
-            });
-            let serverPort;
-            // watch模型下开启server
-            if (options.watch) {
-                serverPort = yield portfinder_1.default.getPortPromise({
-                    port: JavascriptDefaultCompileOption_1.default.serverPort
+            else if (avdList.length === 1) {
+                const needtoRun = yield (0, prompts_1.confirm)({
+                    message: 'there is only one emulator, need to Run?',
+                    default: true
                 });
-                (0, JavascriptDefaultCompileOption_1.setServerPort)(serverPort);
+                if (!needtoRun) {
+                    VelaAvdUtils_1.default.createVelaAvdByInquire();
+                    return;
+                }
+                avdName = avdList[0].avdName;
+                shared_utils_1.ColorConsole.warn(`Start run by :${avdName} `);
             }
+            else {
+                avdName = yield (0, prompts_1.select)({
+                    message: 'name of the avd to start',
+                    choices: avdList.map((item) => {
+                        return { value: item.avdName };
+                    })
+                });
+            }
+            // 检查选择的模拟器是否符合要求
+            if (avdName && !this.isAvailableEmulator(avdName)) {
+                shared_utils_1.ColorConsole.throw(`this emulator is unavailable, please create a new emulator.`);
+                return;
+            }
+            let serverPort;
+            // watch模型下开启server
+            serverPort = yield portfinder_1.default.getPortPromise({
+                port: aiotpack_1.JavascriptDefaultCompileOption.serverPort
+            });
+            (0, aiotpack_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;
+            let grpcPort;
+            // 设置vncPort
             if (options.openVNC) {
-                vncPort = yield portfinder_1.default.getPortPromise({ port: constants_1.defaultVncPort, stopPort: constants_1.defaultVncPort + 100 });
+                grpcPort = yield portfinder_1.default.getPortPromise({
+                    port: constants_1.defaultVncPort,
+                    stopPort: constants_1.defaultVncPort + 100
+                });
+            }
+            // 设置adbPort
+            const adbPort = yield (0, index_1.getEvenPort)();
+            if (!adbPort) {
+                shared_utils_1.ColorConsole.throw(`${adbPort},5555和5585之间的端口号已全部不占用,请解决端口冲突,再启动模拟器`);
+                return;
+            }
+            // 设置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,
+                grpcPort,
+                adbPort,
+                debugPort
             };
-            goldfishInstance.start(startOptions);
+            yield goldfishInstance.start(startOptions);
+            this.ws = new ws_1.default(`ws://localhost:${serverPort}`);
             // waiter
             // const startWaiter: PersistentCommand = new PersistentCommand({
             //   description: 'aiot-toolkit start 的常驻命令',
@@ -135,5 +166,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/starter/XtsStarter.d.ts

@@ -1,9 +1,9 @@
-import ParamType from '@aiot-toolkit/commander/lib/interface/IParam';
+import { IParam } from '@aiot-toolkit/commander';
 import XtsBuilder from '../builder/XtsBuilder';
 import IStarter from './IStarter';
 declare class XtsStarter extends IStarter {
     builder: XtsBuilder;
-    params: ParamType[];
+    params: IParam[];
     start(projectPath: string, options: any): void;
 }
 export default XtsStarter;

package/lib/starter/androidRouter/LinkMode.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 连接类型
+ */
+declare enum LinkMode {
+    NULL = 0,
+    WIFI = 1,
+    ADB = 2
+}
+export default LinkMode;

package/lib/starter/androidRouter/LinkMode.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * 连接类型
+ */
+var LinkMode;
+(function (LinkMode) {
+    LinkMode[LinkMode["NULL"] = 0] = "NULL";
+    LinkMode[LinkMode["WIFI"] = 1] = "WIFI";
+    LinkMode[LinkMode["ADB"] = 2] = "ADB";
+})(LinkMode || (LinkMode = {}));
+exports.default = LinkMode;

package/lib/starter/androidRouter/PackageRouter.d.ts

@@ -0,0 +1,55 @@
+import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
+import { IRouteItem, IRouter } from '@aiot-toolkit/shared-utils';
+interface IPackageRouter {
+    projectPath: string;
+    options: IJavascriptCompileOption;
+}
+/**
+ * 打包相关的路由配置
+ * 用于开发机的httpServer
+ */
+declare class PackageRouter implements IRouter<IPackageRouter> {
+    readonly param: IPackageRouter;
+    constructor(param: IPackageRouter);
+    routeList: IRouteItem<any, {}>[];
+    /**
+     * 下载 rpk 包
+     * @param ctx
+     * @param next
+     */
+    private handlerDownLoadRpk;
+    private handlerQrCode;
+    /**
+     * 记录设备信息
+     *
+     * 获取请求的 ip 和端口，记录到本机中，最多记录5个
+     *
+     * 文件内容的格式为：
+     * ```
+     * records: {
+     *    "快应用项目路径":[
+     *        {ip:"", port:""},
+     *        {ip:"", port:""},
+     *        {ip:"", port:""}
+     *    ]
+     * }
+     * ```
+     *
+     *
+     * 此记录的作用是：当重新打包后，获取已连接的设备列表
+     * @param ctx
+     * @param next
+     */
+    private recordDevice;
+    private getClientFromRequest;
+    /**
+     * http 请求中，用于返回下载文件
+     *
+     * 调用此方法后，仍需调用 next()
+     *
+     * @param filePath 文件绝对路径
+     * @param ctx 请求上下文
+     */
+    private download;
+}
+export default PackageRouter;

package/lib/starter/androidRouter/PackageRouter.js

@@ -0,0 +1,152 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const qr_image_1 = __importDefault(require("qr-image"));
+const LinkMode_1 = __importDefault(require("./LinkMode"));
+const CLIENT_PORT = 39517;
+/**
+ * 打包相关的路由配置
+ * 用于开发机的httpServer
+ */
+class PackageRouter {
+    constructor(param) {
+        this.param = param;
+        this.routeList = [
+            {
+                path: '/qrcode',
+                handler: (ctx, next) => {
+                    return this.handlerQrCode(ctx, next);
+                }
+            },
+            {
+                path: '/bundle',
+                handler: (ctx, next) => {
+                    this.recordDevice(ctx);
+                    return this.handlerDownLoadRpk(ctx, next);
+                }
+            }
+        ];
+        /**
+         * 下载 rpk 包
+         * @param ctx
+         * @param next
+         */
+        this.handlerDownLoadRpk = (ctx, next) => {
+            const { projectPath, options } = this.param;
+            const dist = path_1.default.join(projectPath, options.releasePath);
+            const files = fs_extra_1.default.readdirSync(dist).filter((item) => path_1.default.extname(item) === '.rpk');
+            const filePath = files.length ? path_1.default.join(dist, files[0]) : '';
+            this.download(filePath, ctx);
+            return next();
+        };
+        this.handlerQrCode = (ctx, next) => {
+            const qrText = ctx.origin;
+            const image = qr_image_1.default.image(qrText, {
+                size: 9
+            });
+            ctx.type = 'image/png';
+            ctx.body = image;
+            return next();
+        };
+        /**
+         * 记录设备信息
+         *
+         * 获取请求的 ip 和端口，记录到本机中，最多记录5个
+         *
+         * 文件内容的格式为：
+         * ```
+         * records: {
+         *    "快应用项目路径":[
+         *        {ip:"", port:""},
+         *        {ip:"", port:""},
+         *        {ip:"", port:""}
+         *    ]
+         * }
+         * ```
+         *
+         *
+         * 此记录的作用是：当重新打包后，获取已连接的设备列表
+         * @param ctx
+         * @param next
+         */
+        this.recordDevice = (ctx) => __awaiter(this, void 0, void 0, function* () {
+            const clientInfo = this.getClientFromRequest(ctx);
+            if (!(clientInfo === null || clientInfo === void 0 ? void 0 : clientInfo.clientIp)) {
+                return;
+            }
+            if (clientInfo.linkMode === LinkMode_1.default.WIFI) {
+                const max = 5;
+                const filePath = this.param.options.clientRecordPath;
+                const projectPath = this.param.projectPath;
+                const data = {
+                    sn: clientInfo.sn,
+                    ip: clientInfo.clientIp,
+                    port: CLIENT_PORT
+                };
+                const json = fs_extra_1.default.readJSONSync(filePath, { throws: false }) || {};
+                if (!json.records) {
+                    json.records = {};
+                }
+                if (!json.records[projectPath]) {
+                    json.records[projectPath] = [];
+                }
+                const deviceList = json.records[projectPath];
+                if (deviceList.findIndex((item) => item.ip === data.ip) < 0) {
+                    deviceList.push(data);
+                    if (deviceList.length > max) {
+                        deviceList.splice(0, deviceList.length - max);
+                    }
+                    fs_extra_1.default.ensureDirSync(path_1.default.dirname(filePath));
+                    fs_extra_1.default.writeJSONSync(filePath, json, { spaces: 2 });
+                }
+            }
+        });
+    }
+    getClientFromRequest(ctx) {
+        const clientIp = shared_utils_1.NetworkUtil.getClientIp(ctx);
+        const serverIp = shared_utils_1.NetworkUtil.getIPv4IPAddress();
+        const sn = ctx.request.header['device-serial-number'];
+        let linkMode = LinkMode_1.default.NULL;
+        if (clientIp === '127.0.0.1' && sn) {
+            linkMode = LinkMode_1.default.ADB;
+        }
+        else if (clientIp !== '127.0.0.1' && clientIp !== serverIp) {
+            linkMode = LinkMode_1.default.WIFI;
+        }
+        return { clientIp, sn, linkMode };
+    }
+    /**
+     * http 请求中，用于返回下载文件
+     *
+     * 调用此方法后，仍需调用 next()
+     *
+     * @param filePath 文件绝对路径
+     * @param ctx 请求上下文
+     */
+    download(filePath, ctx) {
+        if (filePath && fs_extra_1.default.existsSync(filePath)) {
+            ctx.set('Content-Type', 'application/octet-stream');
+            ctx.set('Content-Transfer-Encoding', 'binary');
+            ctx.set('Content-Disposition', `attachment; filename=${path_1.default.basename(filePath)}`);
+            ctx.body = fs_extra_1.default.createReadStream(filePath);
+        }
+        else {
+            ctx.throw('404', 404);
+        }
+    }
+}
+exports.default = PackageRouter;

package/lib/starter/androidRouter/h5/index.css

@@ -0,0 +1,167 @@
+.alert-warning {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #faebcc;
+  text-align: left;
+}
+
+.alert {
+  padding: 8px;
+  margin: 10px auto;
+  width: 400px;
+  min-width: 350px;
+  border: 1px solid transparent;
+  border-radius: 6px;
+  box-shadow: 0 6px 10px rgba(0, 0, 0, 0.15);
+}
+
+.alert p {
+  margin: 6px;
+}
+
+.panel-default {
+  border-color: #ddd;
+}
+
+.panel {
+  margin-bottom: 20px;
+  background-color: #fff;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+  margin: 10px auto;
+  box-shadow: 0 6px 10px rgba(0, 0, 0, 0.15);
+  width: 400px;
+  min-width: 350px;
+  padding: 8px;
+}
+
+.panel-default > .panel-heading {
+  color: #333;
+  border-color: #ddd;
+  text-align: left;
+}
+
+.panel-heading {
+  padding: 8px 15px;
+  border-bottom: 1px solid transparent;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+
+.table {
+  width: 100%;
+  max-width: 100%;
+  margin: 6px;
+  background-color: transparent;
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+.table td {
+  color: black;
+  text-shadow: none;
+  text-align: left;
+}
+
+.table td.tname {
+  width: 70%;
+}
+
+body {
+  margin: 0;
+  display: block;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+.hide {
+  display: none !important;
+}
+
+.qr-code-panel {
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+}
+
+.qr-code-panel .qr-img {
+  margin: 10px 200px;
+  min-width: 350px;
+}
+
+.bd-bg {
+  position: relative;
+  padding: 40px 0;
+  color: black;
+  text-align: center;
+  background: #eee;
+}
+
+.updatetip-link {
+  padding: 0 5px;
+}
+
+table.tunning tr {
+  padding: 8px 15px;
+}
+
+.btn {
+  display: inline-block;
+  padding: 6px 12px;
+  margin-bottom: 0;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1.42857143;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  -ms-touch-action: manipulation;
+  touch-action: manipulation;
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background-image: none;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  margin-left: 5px;
+}
+
+.btn-default {
+  color: #333;
+  background-color: #fff;
+  border-color: #ccc;
+}
+
+.label {
+  display: inline;
+  padding: 0.7em;
+  font-size: 75%;
+  font-weight: 700;
+  line-height: 1;
+  color: #fff;
+  text-align: center;
+  text-decoration: none;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: 0.25em;
+}
+
+.label-info {
+  background-color: #5bc0de;
+}
+.block {
+  width: 420px;
+}
+.block .block-title {
+  font-size: 16px;
+  margin: 0.5em 0;
+}
+.block a {
+  color: #0055ff;
+}