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

package/lib/bin.js

@@ -13,17 +13,17 @@ 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 semver_1 = __importDefault(require("semver"));
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 // 支持的最低node版本
 const NODE_MINIMUM_VERSION = '16.0.0';
 checkVersion();
-const CompileMode_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/compiler/enum/CompileMode"));
+const aiotpack_1 = require("@aiot-toolkit/aiotpack");
 const commander_1 = require("@aiot-toolkit/commander");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const shared_utils_2 = require("@aiot-toolkit/shared-utils");
 const UxBuilder_1 = __importDefault(require("./builder/UxBuilder"));
 const XtsBuilder_1 = __importDefault(require("./builder/XtsBuilder"));
+const AndroidUxStart_1 = __importDefault(require("./starter/AndroidUxStart"));
 const UxStarter_1 = __importDefault(require("./starter/UxStarter"));
 const XtsStarter_1 = __importDefault(require("./starter/XtsStarter"));
 const DeviceUtil_1 = __importDefault(require("./utils/DeviceUtil"));
@@ -32,23 +32,27 @@ const VelaAvdUtils_1 = __importDefault(require("./utils/VelaAvdUtils"));
 function checkVersion() {
     const currentVersion = process.versions.node;
     if (semver_1.default.lt(currentVersion, NODE_MINIMUM_VERSION)) {
-        ColorConsole_1.default.throw('It is detected that the current NodeJS version ', { word: currentVersion }, ' is too low, please upgrade to NodeJS version higher than ', { word: NODE_MINIMUM_VERSION });
+        shared_utils_1.ColorConsole.throw('It is detected that the current NodeJS version ', { word: currentVersion }, ' is too low, please upgrade to NodeJS version higher than ', { word: NODE_MINIMUM_VERSION });
         process.exit();
     }
 }
 // 配置支持的 builder 类型，新增的项目类型，需在此处加上类型
 const projectMapper = {
-    ux: {
+    [shared_utils_2.ProjectType.VELA_UX]: {
         builder: UxBuilder_1.default,
         starter: UxStarter_1.default
     },
-    xts: {
+    [shared_utils_2.ProjectType.VELA_XTS]: {
         builder: XtsBuilder_1.default,
         starter: XtsStarter_1.default
+    },
+    [shared_utils_2.ProjectType.ANDDROID_UX]: {
+        builder: UxBuilder_1.default,
+        starter: AndroidUxStart_1.default
     }
 };
 function findBuilder() {
-    const projectType = getProjectType();
+    const projectType = shared_utils_2.ProjectType.getProjectType(process.cwd());
     return new projectMapper[projectType].builder();
 }
 function build(command, description) {
@@ -60,26 +64,14 @@ function build(command, description) {
         paramList,
         action: (option) => __awaiter(this, void 0, void 0, function* () {
             // 获取对应的 build；如果存在，执行 build 函数，不存在，提示
-            option.mode = command === 'release' ? CompileMode_1.default.PRODUCTION : CompileMode_1.default.DEVELOPMENT;
+            option.mode = command === 'release' ? aiotpack_1.CompileMode.PRODUCTION : aiotpack_1.CompileMode.DEVELOPMENT;
             const projectPath = process.cwd();
             yield builder.build(projectPath, option);
         })
     };
 }
-function getProjectType() {
-    const projectPath = process.cwd();
-    const isXts = fs_1.default.existsSync(path_1.default.resolve(projectPath, 'app/app.xts'));
-    const isUx = fs_1.default.existsSync(path_1.default.resolve(projectPath, 'src/app.ux'));
-    if (isUx) {
-        return "ux" /* ProjectType.UX */;
-    }
-    else if (isXts) {
-        return "xts" /* ProjectType.XTS */;
-    }
-    return "ux" /* ProjectType.UX */;
-}
 function findStarter(command, description) {
-    const projectType = getProjectType();
+    const projectType = shared_utils_2.ProjectType.getProjectType(process.cwd());
     return new projectMapper[projectType].starter(command, description);
 }
 function main() {
@@ -100,8 +92,6 @@ function main() {
                         const builder = findBuilder();
                         option.watch = true;
                         yield builder.build(projectPath, option);
-                        // waiter.describe()
-                        // waiter.start()
                     })
                 },
                 {
@@ -110,10 +100,10 @@ function main() {
                     action: () => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const connectedDevices = yield DeviceUtil_1.default.getAllConnectedDevices();
-                            ColorConsole_1.default.info(`The connected devices are: ${connectedDevices ? connectedDevices.join(', ') : 'null'}`);
+                            shared_utils_1.ColorConsole.info(`The connected devices are: ${connectedDevices ? connectedDevices.join(', ') : 'null'}`);
                         }
                         catch (error) {
-                            ColorConsole_1.default.throw(`Error: getConnectedDevices failed`);
+                            shared_utils_1.ColorConsole.throw(`Error: getConnectedDevices failed`);
                         }
                     })
                 },
@@ -162,10 +152,12 @@ function main() {
                     action: (option) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const successMessage = yield DeviceUtil_1.default.installDbgAndMkp(option);
-                            ColorConsole_1.default.success(`${successMessage}`);
+                            shared_utils_1.ColorConsole.success(`${successMessage}`);
                         }
                         catch (error) {
-                            ColorConsole_1.default.throw(`installDbgAndMkp failed, errorMessage: ${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}'}`);
+                            shared_utils_1.ColorConsole.throw(`installDbgAndMkp failed, errorMessage:'}`, {
+                                word: (error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'
+                            });
                         }
                     })
                 },
@@ -203,7 +195,7 @@ function main() {
                     action: () => __awaiter(this, void 0, void 0, function* () {
                         VelaAvdUtils_1.default.initEmulatorEnv();
                     })
-                },
+                }
             ]
         };
         commander_1.Command.registeProgram(config);

package/lib/builder/UxBuilder.d.ts

@@ -1,19 +1,26 @@
-import CompileMode from '@aiot-toolkit/aiotpack/lib/compiler/enum/CompileMode';
-import IJavascriptCompileOption from '@aiot-toolkit/aiotpack/lib/compiler/javascript/interface/IJavascriptCompileOption';
-import ParamType from '@aiot-toolkit/commander/lib/interface/IParam';
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
+import { CompileMode, IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
+import { IParam } from '@aiot-toolkit/commander';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
 import IBuilder from './IBuilder';
 interface IUxBuilderOption extends Dictionary {
     watch?: boolean;
     mode: CompileMode;
     disabledJsc: boolean;
     enableE2e?: boolean;
+    /**
+     * 是否自动补全 manifest.json 中的 features 配置
+     */
+    completeFeature?: boolean;
 }
 /**
  * UxBuilder
  */
 declare class UxBuilder implements IBuilder<IUxBuilderOption> {
+    private readonly events?;
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
+    constructor(events?: {
+        onBuildSuccess?: (() => void) | undefined;
+    } | undefined);
     /**
      * 获取build的编译配置
      * @param projectPath 项目路径
@@ -29,7 +36,7 @@ declare class UxBuilder implements IBuilder<IUxBuilderOption> {
     build(projectPath: string, options: IUxBuilderOption): Promise<void>;
     private readQuickAppConfig;
     static readonly PROJECT_TYPE = "ux quick app";
-    params: ParamType[];
+    params: IParam[];
     match(projectPath: string): boolean;
 }
 export default UxBuilder;

package/lib/builder/UxBuilder.js

@@ -23,21 +23,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const CompileMode_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/compiler/enum/CompileMode"));
-const JavascriptDefaultCompileOption_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/JavascriptDefaultCompileOption"));
-const UxConfig_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/config/UxConfig"));
+const aiotpack_1 = require("@aiot-toolkit/aiotpack");
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const shared_utils_2 = require("@aiot-toolkit/shared-utils");
 const file_lane_1 = require("file-lane");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
-const UxBuilderUtils_1 = __importDefault(require("../utils/UxBuilderUtils"));
+const fs_1 = __importDefault(require("fs"));
+const path_2 = __importDefault(require("path"));
 /**
  * UxBuilder
  */
 class UxBuilder {
-    constructor() {
+    constructor(events) {
+        this.events = events;
         this.QUICKAPP_CONFIG = 'quickapp.config.js';
         this.params = [
             {
@@ -78,6 +78,12 @@ class UxBuilder {
                 name: 'optimize-css-attr',
                 description: 'optimize css attr',
                 defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'complete-feature',
+                description: 'auto complete the features are used in the code into the features field of the manifest.json file',
+                defaultValue: false
             }
         ];
     }
@@ -92,10 +98,10 @@ class UxBuilder {
         const _a = quickappConfig || {}, { cli } = _a, otherConfig = __rest(_a, ["cli"]);
         options = lodash_1.default.merge({}, options, cli);
         // 项目配置
-        const uxProjectConfig = new UxConfig_1.default(projectPath);
+        const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
         // 编译配置
-        const compileMode = options.mode || CompileMode_1.default.DEVELOPMENT;
-        const compilerOption = lodash_1.default.merge(JavascriptDefaultCompileOption_1.default, Object.assign(Object.assign({}, options), { projectPath: path_1.default.join(projectPath, uxProjectConfig.output), mode: compileMode, enableProtobuf: options.enableProtobuf, devtool: UxBuilderUtils_1.default.getDevtoolValue(compileMode, options.devtool || false) }), otherConfig);
+        const compileMode = options.mode || aiotpack_1.CompileMode.DEVELOPMENT;
+        const compilerOption = lodash_1.default.merge(aiotpack_1.JavascriptDefaultCompileOption, Object.assign(Object.assign({}, options), { projectPath: path_1.default.join(projectPath, uxProjectConfig.output), mode: compileMode, enableProtobuf: options.enableProtobuf }), otherConfig);
         return compilerOption;
     }
     /**
@@ -108,11 +114,11 @@ class UxBuilder {
         return __awaiter(this, void 0, void 0, function* () {
             const watch = options.watch || false;
             // 项目配置
-            const uxProjectConfig = new UxConfig_1.default(projectPath);
+            const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
             // 编译配置
             const compilerOption = this.getCompilerOption(projectPath, options);
-            ColorConsole_1.default.info('start build: ', {
-                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Info),
+            shared_utils_2.ColorConsole.info('start build: ', {
+                style: shared_utils_2.ColorConsole.getStyle(shared_utils_1.Loglevel.INFO),
                 word: JSON.stringify({
                     projectPath,
                     options,
@@ -124,7 +130,7 @@ class UxBuilder {
                 }, null, 2)
             });
             // 开始编译项目
-            yield new file_lane_1.FileLane(uxProjectConfig, projectPath, compilerOption).start({ watch });
+            yield new file_lane_1.FileLane(uxProjectConfig, projectPath, compilerOption, this.events).start({ watch });
         });
     }
     readQuickAppConfig(projectPath) {
@@ -135,13 +141,14 @@ class UxBuilder {
                 return data;
             }
             catch (error) {
-                ColorConsole_1.default.throw((error === null || error === void 0 ? void 0 : error.toString()) || '');
+                shared_utils_2.ColorConsole.throw((error === null || error === void 0 ? void 0 : error.toString()) || '');
             }
         }
         return;
     }
     match(projectPath) {
-        return projectPath.includes('ux');
+        // src/app.ux 存在视为ux项目
+        return fs_1.default.existsSync(path_2.default.resolve(projectPath, 'src/app.ux'));
     }
 }
 UxBuilder.PROJECT_TYPE = 'ux quick app';

package/lib/builder/XtsBuilder.js

@@ -13,12 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const aiotpack_1 = require("@aiot-toolkit/aiotpack");
-const ICompileOptions_1 = require("@aiot-toolkit/aiotpack/lib/interface/ICompileOptions");
+const aiotpack_2 = require("@aiot-toolkit/aiotpack");
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const StringUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/StringUtil"));
 const file_lane_1 = require("file-lane");
-const FileLaneUtil_1 = __importDefault(require("file-lane/lib/utils/FileLaneUtil"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 /**
@@ -30,15 +27,15 @@ class XtsBuilder {
             {
                 name: 'skip',
                 type: 'string',
-                description: `Can configure skip steps, comma separated, optional values: ${ICompileOptions_1.skipList.join(',')}`,
+                description: `Can configure skip steps, comma separated, optional values: ${aiotpack_2.skipList.join(',')}`,
                 validate(value) {
                     // TODO: validate 不起作用
-                    const res = StringUtil_1.default.string2arrayByComma(value);
+                    const res = shared_utils_1.StringUtil.string2arrayByComma(value);
                     const unValid = res.find((r) => {
-                        return !ICompileOptions_1.skipList.includes(r);
+                        return !aiotpack_2.skipList.includes(r);
                     });
                     if (unValid) {
-                        return `${unValid} is unvalidate,  validate value are ${ICompileOptions_1.skipList.join(',')}, Multiple values separated by commas`;
+                        return `${unValid} is unvalidate,  validate value are ${aiotpack_2.skipList.join(',')}, Multiple values separated by commas`;
                     }
                     return true;
                 }
@@ -53,14 +50,14 @@ class XtsBuilder {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const watch = options.watch || false;
-            ColorConsole_1.default.success('Start build...\n', { word: 'ProjectPath: ', style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Success) }, projectPath, '\n', { word: 'buildOptions: ', style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Success) }, JSON.stringify(options));
+            shared_utils_1.ColorConsole.success('Start build...\n', { word: 'ProjectPath: ', style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.SUCCESS) }, projectPath, '\n', { word: 'buildOptions: ', style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.SUCCESS) }, JSON.stringify(options));
             const compilerOptions = {
-                skip: StringUtil_1.default.string2arrayByComma(options.skip)
+                skip: shared_utils_1.StringUtil.string2arrayByComma(options.skip)
             };
             const config = new aiotpack_1.XtsConfig();
             if ((_a = compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('xts2ts')) {
-                ColorConsole_1.default.info("### skip compile xts to ts due to --skip ${compilerOptions?.skip.join(',')}");
-                const context = FileLaneUtil_1.default.createContext(config.output, projectPath);
+                shared_utils_1.ColorConsole.info("### skip compile xts to ts due to --skip ${compilerOptions?.skip.join(',')}");
+                const context = file_lane_1.FileLaneUtil.createContext(config.output, projectPath);
                 const preWorks = config.preWorks || [];
                 for (let item of preWorks) {
                     try {

package/lib/starter/AndroidUxStart.d.ts

@@ -0,0 +1,39 @@
+import IStarter from './IStarter';
+import { PersistentCommand } from '@aiot-toolkit/commander';
+/**
+ * AndroidUxStart
+ *
+ * 1. 启动本机开发者http服务器，并提供二维码，以下载 rpk
+ * 2. 打包 rpk，并监听文件变化，重新打包
+ */
+declare class AndroidUxStart extends IStarter {
+    private server?;
+    private port?;
+    private builder?;
+    private projectPath;
+    get waiter(): PersistentCommand;
+    /**
+     * 启动
+     * 1. build 项目
+     * 2. build 成功，则创建http服务器
+     */
+    start(projectPath: string, options: any): Promise<void>;
+    /**
+     * 创建服务器
+     *
+     * 1. 使用 koa 创建服务器
+     * 2. 显示服务器地址和二维码
+     * @returns
+     */
+    private createServer;
+    private showAddress;
+    private build;
+    dispose(): void;
+    /**
+     * 通知已知的设备，应用有更新
+     * @param projectPath
+     * @param options
+     */
+    private noticeDeviceListUpdate;
+}
+export default AndroidUxStart;

package/lib/starter/AndroidUxStart.js

@@ -0,0 +1,170 @@
+"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 aiotpack_1 = require("@aiot-toolkit/aiotpack");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const http_1 = __importDefault(require("http"));
+const path_1 = __importDefault(require("path"));
+const UxBuilder_1 = __importDefault(require("../builder/UxBuilder"));
+const IStarter_1 = __importDefault(require("./IStarter"));
+const PackageRouter_1 = __importDefault(require("./androidRouter/PackageRouter"));
+const commander_1 = require("@aiot-toolkit/commander");
+/**
+ * AndroidUxStart
+ *
+ * 1. 启动本机开发者http服务器，并提供二维码，以下载 rpk
+ * 2. 打包 rpk，并监听文件变化，重新打包
+ */
+class AndroidUxStart extends IStarter_1.default {
+    constructor() {
+        super(...arguments);
+        this.projectPath = '';
+    }
+    get waiter() {
+        return new commander_1.PersistentCommand({
+            description: 'you can press follow keys to do something',
+            options: [
+                {
+                    key: 'q',
+                    description: 'show qrcode',
+                    action: () => {
+                        this.showAddress();
+                    }
+                },
+                {
+                    key: '?',
+                    description: 'show waiter desc',
+                    action: () => {
+                        this.waiter.clearLog();
+                        this.waiter.describe();
+                    }
+                }
+            ]
+        });
+    }
+    /**
+     * 启动
+     * 1. build 项目
+     * 2. build 成功，则创建http服务器
+     */
+    start(projectPath, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.projectPath = projectPath;
+            const buildOption = Object.assign(Object.assign({}, aiotpack_1.JavascriptDefaultCompileOption), options);
+            yield this.build(projectPath, buildOption);
+            yield this.createServer(buildOption);
+        });
+    }
+    /**
+     * 创建服务器
+     *
+     * 1. 使用 koa 创建服务器
+     * 2. 显示服务器地址和二维码
+     * @returns
+     */
+    createServer(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                const routeConfigList = [
+                    new PackageRouter_1.default({
+                        projectPath: this.projectPath,
+                        options
+                    })
+                ];
+                const data = yield shared_utils_1.NetworkUtil.createHttpServer({
+                    wantPort: options.server.port,
+                    routeConfigList,
+                    staticFolder: path_1.default.join(__dirname, './androidRouter/h5'),
+                    events: {
+                        onSuccess: () => {
+                            this.server = data.server;
+                            this.port = data.port;
+                            this.showAddress();
+                            resolve(data);
+                        }
+                    }
+                });
+            }));
+        });
+    }
+    showAddress() {
+        const ip = shared_utils_1.NetworkUtil.getIPv4IPAddress();
+        const { port } = this;
+        if (!ip) {
+            const localUrl = `http://localhost:${port}`;
+            shared_utils_1.ColorConsole.warn(`devServer`, localUrl);
+        }
+        else {
+            const lanUrl = `http://${ip}:${port}`;
+            // 显示二维码
+            shared_utils_1.ColorConsole.info(`devServer`, lanUrl);
+            shared_utils_1.CommonUtil.outputQRCodeOnTerminal(lanUrl);
+        }
+    }
+    build(projectPath, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.builder) {
+                this.builder = new UxBuilder_1.default({
+                    onBuildSuccess: () => {
+                        this.noticeDeviceListUpdate(projectPath, options);
+                    }
+                });
+            }
+            yield this.builder.build(projectPath, Object.assign(Object.assign({}, options), { watch: true }));
+        });
+    }
+    dispose() {
+        var _a;
+        (_a = this.server) === null || _a === void 0 ? void 0 : _a.close();
+    }
+    /**
+     * 通知已知的设备，应用有更新
+     * @param projectPath
+     * @param options
+     */
+    noticeDeviceListUpdate(projectPath, options) {
+        var _a;
+        const { clientRecordPath } = options;
+        const json = fs_extra_1.default.readJSONSync(clientRecordPath, { throws: false });
+        const deviceList = (_a = json === null || json === void 0 ? void 0 : json.records) === null || _a === void 0 ? void 0 : _a[projectPath];
+        if (deviceList) {
+            deviceList.forEach((item) => {
+                const { ip, port } = item;
+                if (!ip) {
+                    return;
+                }
+                const url = `http://${ip}:${port}/update`;
+                const requestOption = { host: ip, port, path: '/update', timeout: 3000 };
+                http_1.default
+                    .request(requestOption, () => {
+                    shared_utils_1.ColorConsole.success(`Notify the phone to update the rpk file success`, {
+                        word: url
+                    });
+                })
+                    .on('error', (error) => {
+                    shared_utils_1.ColorConsole.warn(`Notify the phone to update the rpk file`, { word: 'error: ' }, {
+                        word: error.message
+                    });
+                })
+                    .on('timeout', () => {
+                    shared_utils_1.ColorConsole.warn(`Notify the phone to update the rpk file`, { word: 'timeout: ' }, {
+                        word: url
+                    });
+                });
+            });
+        }
+    }
+}
+exports.default = AndroidUxStart;

package/lib/starter/IStarter.d.ts

@@ -1,4 +1,4 @@
-import { ICommand, IParam } from '@aiot-toolkit/commander';
+import { ICommand, IParam, PersistentCommand } from '@aiot-toolkit/commander';
 /**
  * IStarter
  */
@@ -10,6 +10,7 @@ export default abstract class IStarter<O = any> {
      */
     readonly params: IParam[];
     constructor(name: string, description: string);
+    get waiter(): PersistentCommand | undefined;
     /**
      * start 的命令
      */

package/lib/starter/IStarter.js

@@ -21,6 +21,9 @@ class IStarter {
          */
         this.params = [];
     }
+    get waiter() {
+        return;
+    }
     /**
      * start 的命令
      */
@@ -29,9 +32,10 @@ class IStarter {
             name: this.name,
             description: this.description,
             paramList: this.params,
+            waiter: this.waiter,
             action: (option) => __awaiter(this, void 0, void 0, function* () {
                 const projectPath = process.cwd();
-                this.start(projectPath, option);
+                return this.start(projectPath, option);
             })
         };
     }

package/lib/starter/UxStarter.d.ts

@@ -1,4 +1,4 @@
-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';
@@ -7,8 +7,9 @@ import IStarter from './IStarter';
  * ux快应用启动器
  */
 declare class UxStarter extends IStarter<IStartOptions> {
+    private ws;
     builder: UxBuilder;
-    params: ParamType[];
+    params: IParam[];
     start(projectPath: string, options: any): Promise<void>;
     /**
      * 检查选择的模拟器在当前环境下是否可以使用