aiot-toolkit 2.0.1-alpha.9 → 2.0.2-dev.2

package/lib/starter/UxStarter.js

@@ -0,0 +1,136 @@
+"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) {
+        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 JavascriptDefaultCompileOption_1 = __importStar(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/JavascriptDefaultCompileOption"));
+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 prompts_1 = require("@inquirer/prompts");
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+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"));
+class UxStarter extends IStarter_1.default {
+    constructor() {
+        super(...arguments);
+        this.builder = new UxBuilder_1.default();
+        this.params = [
+            {
+                name: 'disableNSH',
+                description: 'disable goldfish NSH terminal',
+                defaultValue: false,
+                type: 'confirm'
+            },
+            {
+                name: 'watch',
+                description: 'recompile project while file changes',
+                defaultValue: false,
+                type: 'confirm'
+            },
+            {
+                name: 'openVNC',
+                description: 'open vnc',
+                defaultValue: false,
+                type: 'confirm'
+            },
+            ...this.builder.params
+        ];
+    }
+    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.');
+                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
+                });
+                (0, JavascriptDefaultCompileOption_1.setServerPort)(serverPort);
+            }
+            // build
+            yield this.builder.build(projectPath, options);
+            // start
+            const goldfishInstance = new emulator_1.GoldfishInstance({
+                sdkHome: path_1.default.resolve(os_1.default.homedir(), '.export'),
+                avdHome: path_1.default.resolve(os_1.default.homedir(), '.android/avd'),
+                projectPath
+            });
+            let vncPort;
+            if (options.openVNC) {
+                vncPort = yield portfinder_1.default.getPortPromise({ port: constants_1.defaultVncPort, stopPort: constants_1.defaultVncPort + 100 });
+            }
+            const startOptions = {
+                avdName,
+                devtool: options.devtool,
+                disableNSH: options.disableNSH,
+                serverPort,
+                vncPort,
+            };
+            goldfishInstance.start(startOptions);
+            // waiter
+            // const startWaiter: PersistentCommand = new PersistentCommand({
+            //   description: 'aiot-toolkit start 的常驻命令',
+            //   options: [
+            //     {
+            //       key: '?',
+            //       description: '显示所有命令',
+            //       action() {
+            //         startWaiter.clearLog()
+            //         startWaiter.describe()
+            //       }
+            //     }
+            //   ]
+            // })
+            // startWaiter.describe()
+            // startWaiter.start()
+        });
+    }
+}
+exports.default = UxStarter;

package/lib/starter/XtsStarter.d.ts

@@ -0,0 +1,9 @@
+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[];
+    start(projectPath: string, options: any): void;
+}
+export default XtsStarter;

package/lib/starter/XtsStarter.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const XtsBuilder_1 = __importDefault(require("../builder/XtsBuilder"));
+const IStarter_1 = __importDefault(require("./IStarter"));
+class XtsStarter extends IStarter_1.default {
+    constructor() {
+        super(...arguments);
+        this.builder = new XtsBuilder_1.default();
+        this.params = [];
+    }
+    start(projectPath, options) { }
+}
+exports.default = XtsStarter;

package/lib/utils/AdbUtils.js

@@ -35,7 +35,6 @@ 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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const adbMiwt = __importStar(require("@miwt/adb"));
 const adb_commander_1 = __importDefault(require("adb-commander"));
@@ -77,18 +76,12 @@ class AdbUtils {
             const adbShell = adbMiwt.execAdbCmd(`adb -s ${deviceSn} shell am start -n "org.hapjs.debugger/.MainActivity"`);
             adbShell.stdout.on('data', (data) => {
                 // 监听stderr事件，获取输出内容
-                ColorConsole_1.default.log({
-                    message: data
-                });
+                ColorConsole_1.default.log(`### startDebugger ### ${data}`);
             });
             adbShell.stderr.on('data', (data) => {
                 // 监听stderr事件，获取输出内容
                 if (data.indexOf('Error') >= 0) {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        message: data
-                    });
-                    process.exit();
+                    ColorConsole_1.default.throw(`### startDebugger ### ${data}`);
                 }
             });
             adbShell.on('close', () => {
@@ -99,5 +92,3 @@ class AdbUtils {
     }
 }
 exports.default = AdbUtils;
-
-//# sourceMappingURL=AdbUtils.js.map

package/lib/utils/DeviceUtil.d.ts

@@ -10,7 +10,7 @@ declare class DeviceUtil {
      * 获取连接上的所有设备数组，供IDE使用
      * @returns
      */
-    static getAllConnectedDevices(): Promise<string[]>;
+    static getAllConnectedDevices(): Promise<string[] | undefined> | undefined;
     /**
      * 安装调试器、预览版
      * @param options

package/lib/utils/DeviceUtil.js

@@ -31,28 +31,16 @@ class DeviceUtil {
         try {
             return AdbUtils_1.default.getAllConnectedDevices().then((deviceList) => {
                 if (deviceList.length > 0) {
-                    ColorConsole_1.default.log({
-                        message: `Devices connected via adb： ${deviceList.join(', ')}.`
-                    });
+                    ColorConsole_1.default.info(`Devices connected via adb： ${deviceList.join(', ')}.`);
                     return Promise.resolve(deviceList);
                 }
                 else {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        message: `No device is currently connected, please check the following preparations in turn：\n  1. Whether the device is started;\n  2. Whether in the same LAN WI-FI;\n  3. Whether the device can be connected to the computer via USB;`,
-                        isOnlyPrintError: true
-                    });
-                    process.exit();
+                    ColorConsole_1.default.throw(`No device is currently connected, please check the following preparations in turn：\n  1. Whether the device is started;\n  2. Whether in the same LAN WI-FI;\n  3. Whether the device can be connected to the computer via USB;`);
                 }
             });
         }
         catch (error) {
-            ColorConsole_1.default.log({
-                level: shared_utils_1.LOG_LEVEL.Error,
-                message: 'Error getting connection information of adb device',
-                isOnlyPrintError: true
-            });
-            process.exit();
+            ColorConsole_1.default.throw('Error getting connection information of adb device');
         }
     }
     /**
@@ -75,11 +63,7 @@ class DeviceUtil {
                 connectDeviceList = finalDeviceList ? [...finalDeviceList] : [];
                 // 若connectDeviceList为空，应该warn并结束程序
                 connectDeviceList.length <= 0 &&
-                    ColorConsole_1.default.log({
-                        message: 'No device requires debugger or previewer installation',
-                        level: shared_utils_1.LOG_LEVEL.Warn
-                    }) &&
-                    process.exit();
+                    ColorConsole_1.default.throw('No device requires debugger or previewer installation');
                 // 3. 下载并获取调试器、预览器地址
                 const debuggerPath = yield this.downloadApk(options, true);
                 const previewPath = yield this.downloadApk(options, false);
@@ -89,7 +73,7 @@ class DeviceUtil {
                 return Promise.resolve('All devices successfully installed the Quickapp debugger and previewer');
             }
             catch (error) {
-                return Promise.reject(new Error(`Failed to install debugger, error message：${error.message}`));
+                return Promise.reject(new Error(`Failed to install debugger, error message：${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`));
             }
         });
     }
@@ -122,21 +106,14 @@ class DeviceUtil {
                     }
                 }
                 if (ip.length === 0) {
-                    ColorConsole_1.default.log({
-                        message: `Since no ip address is entered, the connected device will be connected`
-                    });
+                    ColorConsole_1.default.log(`Since no ip address is entered, the connected device will be connected`);
                     return Promise.resolve();
                 }
                 const ips = ip.trim().split(',');
                 const invalidIps = ips.filter((ip) => !this.ipRegExp.test(ip));
                 if (invalidIps && invalidIps.length) {
                     invalidIps.map((ip) => {
-                        ColorConsole_1.default.log({
-                            message: `ip: ${ip} is invalid IP`,
-                            level: shared_utils_1.LOG_LEVEL.Error,
-                            isOnlyPrintError: true
-                        });
-                        process.exit();
+                        ColorConsole_1.default.throw(`ip: `, { word: ip, style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw) }, ` is invalid IP`);
                     });
                 }
                 else {
@@ -147,26 +124,16 @@ class DeviceUtil {
                         });
                         return AdbUtils_1.default.connect(ip, devicePort)
                             .then(() => {
-                            ColorConsole_1.default.log({
-                                level: shared_utils_1.LOG_LEVEL.Success,
-                                message: `wifi connection ip: The device with ip of "${ip}" succeeded`
-                            });
+                            ColorConsole_1.default.success(`wifi connection ip: The device with ip of "${ip}" succeeded`);
                             return Promise.resolve();
                         })
                             .catch((err) => {
-                            ColorConsole_1.default.log({
-                                level: shared_utils_1.LOG_LEVEL.Error,
-                                message: err,
-                                isOnlyPrintError: true
-                            });
-                            process.exit();
+                            ColorConsole_1.default.throw(`${err}`);
                         });
                     }));
                     return Promise.all(newDeviceListPromiseArray)
                         .then(() => {
-                        ColorConsole_1.default.log({
-                            message: 'All new WIFI devices are connected'
-                        });
+                        ColorConsole_1.default.log(`All new WIFI devices are connected`);
                         return Promise.resolve();
                     })
                         .catch(() => {
@@ -187,10 +154,7 @@ class DeviceUtil {
     static queryDevice(deviceList, orderText = '') {
         return __awaiter(this, void 0, void 0, function* () {
             if (!deviceList || deviceList.length === 0) {
-                ColorConsole_1.default.log({
-                    message: `No device is connected yet, please confirm and try again`,
-                    level: shared_utils_1.LOG_LEVEL.Error
-                });
+                ColorConsole_1.default.throw(`No device is connected yet, please confirm and try again`);
                 return;
             }
             const ALL_TEXT = 'All connected devices';
@@ -228,29 +192,20 @@ class DeviceUtil {
             const apkPath = path_1.default.join(__dirname, './apk/', fileName);
             if (fs_1.default.existsSync(apkPath)) {
                 // apk已下载
-                ColorConsole_1.default.log({
-                    message: 'The installation package has been downloaded, now use the cache file to install'
-                });
+                ColorConsole_1.default.log(`The installation package has been downloaded, now use the cache file to install`);
                 return apkPath;
             }
             else {
                 try {
                     const result = yield RequestUtils_1.default.downloadFile(url, fileName);
                     // 打印出成功信息
-                    ColorConsole_1.default.log({
-                        message: `Success to download, ${result}`,
-                        level: shared_utils_1.LOG_LEVEL.Success
-                    });
+                    ColorConsole_1.default.success(`Success to download, ${result}`);
                     return apkPath;
                 }
                 catch (error) {
                     // 打印出错误
-                    ColorConsole_1.default.log({
-                        message: `Failed to download the installation package, ${error}`,
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        isOnlyPrintError: true
-                    });
-                    process.exit();
+                    ColorConsole_1.default.throw(`Failed to download the installation package, ${error}`);
+                    return '';
                 }
             }
         });
@@ -272,11 +227,7 @@ class DeviceUtil {
                 let countTime = 0;
                 let data;
                 const sleep = () => {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        message: `Error when the device gets running platforms,request again after 3s delay`,
-                        isOnlyPrintError: true
-                    });
+                    ColorConsole_1.default.error(`Error when the device gets running platforms,request again after 3s delay`);
                     return new Promise((resolve) => setTimeout(resolve, 3000));
                 };
                 const requestPlatform = () => __awaiter(this, void 0, void 0, function* () {
@@ -291,27 +242,17 @@ class DeviceUtil {
                         const dataObj = JSON.parse(data);
                         if (!dataObj.availablePlatforms) {
                             // 请求结果不存在平台信息，报错，结束程序
-                            ColorConsole_1.default.log({
-                                level: shared_utils_1.LOG_LEVEL.Error,
-                                message: `the request result no avaliable platform `
-                            });
-                            process.exit();
+                            ColorConsole_1.default.throw(`The request result no avaliable platform `);
                         }
                         else {
                             // 打印请求的平台信息
                             const availablePlatforms = dataObj.availablePlatforms;
-                            ColorConsole_1.default.log({
-                                message: `The Quickapp engine list of device "${deviceSn}" is：${availablePlatforms.join(',')}`
-                            });
+                            ColorConsole_1.default.log(`The Quickapp engine list of device "${deviceSn}" is：${availablePlatforms.join(',')}`);
                         }
                     }
                     else {
                         //请求失败，结束程序
-                        ColorConsole_1.default.log({
-                            level: shared_utils_1.LOG_LEVEL.Error,
-                            message: `the device gets running platforms error`
-                        });
-                        process.exit();
+                        ColorConsole_1.default.throw(`The device gets running platforms error`);
                     }
                 });
                 // 先打开调试器，才能获取运行平台
@@ -319,10 +260,7 @@ class DeviceUtil {
                 yield requestPlatform();
             }
             catch (error) {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: `Error getting the list of Quickapp engines on the device, error message：${error.message}`
-                });
+                ColorConsole_1.default.throw(`Error getting the list of Quickapp engines on the device`);
             }
         });
     }
@@ -341,17 +279,10 @@ class DeviceUtil {
                 const apkName = path_1.default.basename(apkPath);
                 return Promise.all(newDeviceListPromiseArray)
                     .then(() => {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Success,
-                        message: `All devices installed ${apkName}`
-                    });
+                    ColorConsole_1.default.success(`All devices installed ${apkName}`);
                 })
                     .catch(() => {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        message: `Installed ${apkName} failed`
-                    });
-                    process.exit();
+                    ColorConsole_1.default.throw(`Installed ${apkName} failed`);
                 });
             }
             catch (error) { }
@@ -362,5 +293,3 @@ DeviceUtil.ipRegExp = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0
 DeviceUtil.CLIENT_PORT = 39517;
 DeviceUtil.quickapp_url = 'https://statres.quickapp.cn/quickapp/quickapptool/release/platform/';
 exports.default = DeviceUtil;
-
-//# sourceMappingURL=DeviceUtil.js.map

package/lib/utils/RequestUtils.js

@@ -12,7 +12,6 @@ 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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const axios_1 = __importDefault(require("axios"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -39,26 +38,16 @@ class RequestUtils {
                 axios_1.default
                     .post(requrl, options)
                     .then((data) => {
-                    ColorConsole_1.default.log({
-                        message: `### App Server ### Request ${requrl} succeeded`
-                    });
+                    ColorConsole_1.default.log(`### App Server ### Request ${requrl} succeeded`);
                     resolve(data.toString());
                 })
                     .catch((error) => {
                     if (error.respose && error.response.status === 408) {
                         // 超时处理
-                        ColorConsole_1.default.log({
-                            level: shared_utils_1.LOG_LEVEL.Error,
-                            message: `### App Server ### Request ${requrl} timed out, please try again`,
-                            isOnlyPrintError: true
-                        });
+                        ColorConsole_1.default.error(`### App Server ### Request ${requrl} timed out, please try again`);
                     }
                     else {
-                        ColorConsole_1.default.log({
-                            level: shared_utils_1.LOG_LEVEL.Error,
-                            message: `### App Server ### Request ${requrl} error message: ${error.message}`,
-                            isOnlyPrintError: true
-                        });
+                        ColorConsole_1.default.error(`### App Server ### Request ${requrl} error message: ${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`);
                     }
                 });
             });
@@ -67,9 +56,7 @@ class RequestUtils {
     static downloadFile(url, fileName) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             // 开始下载
-            ColorConsole_1.default.log({
-                message: `Start downloading file：${fileName}, address：${url}`
-            });
+            ColorConsole_1.default.log(`Start downloading file：${fileName}, address：${url}`);
             const response = yield axios_1.default.get(url, {
                 responseType: 'arraybuffer'
             });
@@ -86,5 +73,3 @@ class RequestUtils {
     }
 }
 exports.default = RequestUtils;
-
-//# sourceMappingURL=RequestUtils.js.map

package/lib/utils/VelaAvdUtils.d.ts

@@ -26,11 +26,11 @@ 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;
     /** 获取资源文件下载地址 */
-    static getDownloadUrl(file: string, version?: string): string;
+    static getDownloadUrl(dir: string, version?: string, filename?: string): string;
     /**
      * 命令行访问方式创建模拟器
      */