aiot-toolkit 2.0.2 → 2.0.3-beta.10

package/README.md

@@ -32,7 +32,6 @@ aiot-toolkit2.0目前支持的打包格式如下：
 | 命令                     | 说明                     |
 | ------------------------ | ------------------------ |
 | npm create aiot          | 创建并手动选择项目       |
-| npm create aiot xts      | 创建xts项目              |
 | npm create aiot ux       | 创建ux项目               |
 | aiot build               | 构建项目                 |
 | aiot release             | 构建项目-release模式     |
@@ -42,3 +41,5 @@ aiot-toolkit2.0目前支持的打包格式如下：
 | aiot installDbgAndMkp    | 在真机上安装快应用调试器 |
 | aiot createVelaAvd       | 创建 vela 模拟器         |
 | aiot deleteVelaAvd       | 删除 vela 模拟器         |
+
+## 函数调用

package/lib/bin.js

@@ -1,202 +1,176 @@
 #!/usr/bin/env node
 "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 semver_1 = __importDefault(require("semver"));
+
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _semver = _interopRequireDefault(require("semver"));
+var _aiotpack = require("@aiot-toolkit/aiotpack");
+var _commander = require("@aiot-toolkit/commander");
+var _AndroidUxBuilder = _interopRequireDefault(require("./builder/AndroidUxBuilder"));
+var _VelaUxBuilder = _interopRequireDefault(require("./builder/VelaUxBuilder"));
+var _XtsBuilder = _interopRequireDefault(require("./builder/XtsBuilder"));
+var _AndroidUxStart = _interopRequireDefault(require("./starter/AndroidUxStart"));
+var _VelaUxStarter = _interopRequireDefault(require("./starter/VelaUxStarter"));
+var _XtsStarter = _interopRequireDefault(require("./starter/XtsStarter"));
+var _DeviceUtil = _interopRequireDefault(require("./utils/DeviceUtil"));
+var _VelaAvdUtils = _interopRequireDefault(require("./utils/VelaAvdUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // 支持的最低node版本
 const NODE_MINIMUM_VERSION = '18.0.0';
 checkVersion();
-const aiotpack_1 = require("@aiot-toolkit/aiotpack");
-const commander_1 = require("@aiot-toolkit/commander");
-const shared_utils_2 = require("@aiot-toolkit/shared-utils");
-const AndroidUxBuilder_1 = __importDefault(require("./builder/AndroidUxBuilder"));
-const VelaUxBuilder_1 = __importDefault(require("./builder/VelaUxBuilder"));
-const XtsBuilder_1 = __importDefault(require("./builder/XtsBuilder"));
-const AndroidUxStart_1 = __importDefault(require("./starter/AndroidUxStart"));
-const VelaUxStarter_1 = __importDefault(require("./starter/VelaUxStarter"));
-const XtsStarter_1 = __importDefault(require("./starter/XtsStarter"));
-const DeviceUtil_1 = __importDefault(require("./utils/DeviceUtil"));
-const VelaAvdUtils_1 = __importDefault(require("./utils/VelaAvdUtils"));
 // 校验当前环境中的node
 function checkVersion() {
-    const currentVersion = process.versions.node;
-    if (semver_1.default.lt(currentVersion, 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();
-    }
+  const currentVersion = process.versions.node;
+  if (_semver.default.lt(currentVersion, NODE_MINIMUM_VERSION)) {
+    _sharedUtils.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 = {
-    [shared_utils_2.ProjectType.VELA_UX]: {
-        builder: VelaUxBuilder_1.default,
-        starter: VelaUxStarter_1.default
-    },
-    [shared_utils_2.ProjectType.VELA_XTS]: {
-        builder: XtsBuilder_1.default,
-        starter: XtsStarter_1.default
-    },
-    [shared_utils_2.ProjectType.ANDDROID_UX]: {
-        builder: AndroidUxBuilder_1.default,
-        starter: AndroidUxStart_1.default
-    }
+  [_sharedUtils.ProjectType.VELA_UX]: {
+    builder: _VelaUxBuilder.default,
+    starter: _VelaUxStarter.default
+  },
+  [_sharedUtils.ProjectType.VELA_XTS]: {
+    builder: _XtsBuilder.default,
+    starter: _XtsStarter.default
+  },
+  [_sharedUtils.ProjectType.ANDDROID_UX]: {
+    builder: _AndroidUxBuilder.default,
+    starter: _AndroidUxStart.default
+  }
 };
 function findBuilder() {
-    const projectType = shared_utils_2.ProjectType.getProjectType(process.cwd());
-    return new projectMapper[projectType].builder();
+  const projectType = _sharedUtils.ProjectType.getProjectType(process.cwd());
+  return new projectMapper[projectType].builder();
 }
 function build(command, description) {
-    const builder = findBuilder();
-    const paramList = builder === null || builder === void 0 ? void 0 : builder.params;
-    return {
-        name: command,
-        description,
-        paramList,
-        action: (option) => __awaiter(this, void 0, void 0, function* () {
-            try {
-                // 获取对应的 build；如果存在，执行 build 函数，不存在，提示
-                option.mode = command === 'release' ? aiotpack_1.CompileMode.PRODUCTION : aiotpack_1.CompileMode.DEVELOPMENT;
-                const projectPath = process.cwd();
-                yield builder.build(projectPath, option);
-            }
-            catch (error) {
-                shared_utils_1.ColorConsole.error('Build Error:', {
-                    word: (error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'
-                });
-            }
-        })
-    };
+  const builder = findBuilder();
+  const paramList = builder?.params;
+  return {
+    name: command,
+    description,
+    paramList,
+    action: async option => {
+      try {
+        // 获取对应的 build；如果存在，执行 build 函数，不存在，提示
+        option.mode = command === 'release' ? _aiotpack.CompileMode.PRODUCTION : _aiotpack.CompileMode.DEVELOPMENT;
+        const projectPath = process.cwd();
+        await builder.build(projectPath, option);
+      } catch (error) {
+        _sharedUtils.ColorConsole.error('Build Error:', {
+          word: error?.toString() || 'unknown error'
+        });
+      }
+    }
+  };
 }
 function findStarter(command, description) {
-    const projectType = shared_utils_2.ProjectType.getProjectType(process.cwd());
-    return new projectMapper[projectType].starter(command, description);
+  const projectType = _sharedUtils.ProjectType.getProjectType(process.cwd());
+  return new projectMapper[projectType].starter(command, description);
 }
-function main() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const config = {
-            name: 'aiot-toolkit',
-            description: 'contains build, dev, release, etc. commands for aiot toolkit',
-            version: require('../package.json').version,
-            commandList: [
-                build('build', 'build project'),
-                build('release', 'release the project'),
-                findStarter('start', 'start project').getCommond(),
-                {
-                    name: 'getConnectedDevices',
-                    description: 'get all connected devices',
-                    action: () => __awaiter(this, void 0, void 0, function* () {
-                        try {
-                            const connectedDevices = yield DeviceUtil_1.default.getAllConnectedDevices();
-                            shared_utils_1.ColorConsole.info(`The connected devices are: ${connectedDevices ? connectedDevices.join(', ') : 'null'}`);
-                        }
-                        catch (error) {
-                            shared_utils_1.ColorConsole.throw(`Error: getConnectedDevices failed`);
-                        }
-                    })
-                },
-                {
-                    name: 'getPlatforms',
-                    description: 'get available platform(s) on selected device',
-                    paramList: [
-                        {
-                            name: 'ip',
-                            description: 'device ip(eg 127.0.0.1)',
-                            type: 'string',
-                            enableInquirer: true
-                        },
-                        {
-                            name: 'port',
-                            description: 'device port(eg 39517)',
-                            type: 'string',
-                            enableInquirer: true
-                        },
-                        {
-                            name: 'sn',
-                            description: 'view the serial number of the connected device through the "adb devices" command, if it is a device connected via wifi, the format is "ip address:5555"',
-                            type: 'string',
-                            enableInquirer: true
-                        }
-                    ],
-                    action: (option) => __awaiter(this, void 0, void 0, function* () {
-                        yield DeviceUtil_1.default.getAvailablePlatform(option);
-                    })
-                },
-                {
-                    name: 'installDbgAndMkp',
-                    description: 'install "org.hapjs.debugger" & "org.hapjs.mockup" ',
-                    paramList: [
-                        {
-                            name: 'ip',
-                            description: 'device ip(eg 127.0.0.1)',
-                            type: 'string'
-                        },
-                        {
-                            name: 'port',
-                            description: 'device ip(eg 5555)',
-                            type: 'string'
-                        }
-                    ],
-                    action: (option) => __awaiter(this, void 0, void 0, function* () {
-                        try {
-                            const successMessage = yield DeviceUtil_1.default.installDbgAndMkp(option);
-                            shared_utils_1.ColorConsole.success(`${successMessage}`);
-                        }
-                        catch (error) {
-                            shared_utils_1.ColorConsole.throw(`installDbgAndMkp failed, errorMessage:'}`, {
-                                word: (error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'
-                            });
-                        }
-                    })
-                },
-                {
-                    name: 'createVVD',
-                    description: 'create a vela virtual device',
-                    action: () => __awaiter(this, void 0, void 0, function* () {
-                        VelaAvdUtils_1.default.createVelaAvdByInquire();
-                    })
-                },
-                {
-                    name: 'deleteVVD',
-                    description: 'delete vela virtual device(s)',
-                    paramList: [
-                        {
-                            name: 'avdNames',
-                            description: 'avd names to delete',
-                            enableInquirer: true,
-                            type: 'checkbox',
-                            choices: VelaAvdUtils_1.default.velaAvdCls.getVelaAvdList().map((item) => {
-                                return { name: item.avdName, value: item.avdName };
-                            })
-                        }
-                    ],
-                    action: (option) => __awaiter(this, void 0, void 0, function* () {
-                        const { avdNames } = option;
-                        avdNames.forEach((avdName) => {
-                            VelaAvdUtils_1.default.velaAvdCls.deleteVelaAvd(avdName);
-                        });
-                    })
-                },
-                {
-                    name: 'initEmulatorEnv',
-                    description: 'init/reset emulator environment',
-                    action: () => __awaiter(this, void 0, void 0, function* () {
-                        VelaAvdUtils_1.default.initEmulatorEnv();
-                    })
-                }
-            ]
-        };
-        commander_1.Command.registeProgram(config);
-    });
+async function main() {
+  const config = {
+    name: 'aiot-toolkit',
+    description: 'contains build, dev, release, etc. commands for aiot toolkit',
+    version: require('../package.json').version,
+    commandList: [build('build', 'build project'), build('release', 'release the project'), findStarter('start', 'start project').getCommond(), {
+      name: 'getConnectedDevices',
+      description: 'get all connected devices',
+      action: async () => {
+        try {
+          const connectedDevices = await _DeviceUtil.default.getAllConnectedDevices();
+          _sharedUtils.ColorConsole.info(`The connected devices are: ${connectedDevices ? connectedDevices.join(', ') : 'null'}`);
+        } catch (error) {
+          _sharedUtils.ColorConsole.throw(`Error: getConnectedDevices failed`);
+        }
+      }
+    }, {
+      name: 'getPlatforms',
+      description: 'get available platform(s) on selected device',
+      paramList: [{
+        name: 'ip',
+        description: 'device ip(eg 127.0.0.1)',
+        type: 'string',
+        enableInquirer: true
+      }, {
+        name: 'port',
+        description: 'device port(eg 39517)',
+        type: 'string',
+        enableInquirer: true
+      }, {
+        name: 'sn',
+        description: 'view the serial number of the connected device through the "adb devices" command, if it is a device connected via wifi, the format is "ip address:5555"',
+        type: 'string',
+        enableInquirer: true
+      }],
+      action: async option => {
+        await _DeviceUtil.default.getAvailablePlatform(option);
+      }
+    }, {
+      name: 'installDbgAndMkp',
+      description: 'install "org.hapjs.debugger" & "org.hapjs.mockup" ',
+      paramList: [{
+        name: 'ip',
+        description: 'device ip(eg 127.0.0.1)',
+        type: 'string'
+      }, {
+        name: 'port',
+        description: 'device ip(eg 5555)',
+        type: 'string'
+      }],
+      action: async option => {
+        try {
+          const successMessage = await _DeviceUtil.default.installDbgAndMkp(option);
+          _sharedUtils.ColorConsole.success(`${successMessage}`);
+        } catch (error) {
+          _sharedUtils.ColorConsole.throw(`installDbgAndMkp failed, errorMessage:'}`, {
+            word: error?.toString() || 'unknown error'
+          });
+        }
+      }
+    }, {
+      name: 'createVVD',
+      description: 'create a vela virtual device',
+      action: async () => {
+        _VelaAvdUtils.default.createVelaVvdByInquire();
+      }
+    }, {
+      name: 'deleteVVD',
+      description: 'delete vela virtual device(s)',
+      paramList: [{
+        name: 'avdNames',
+        description: 'avd names to delete',
+        enableInquirer: true,
+        type: 'checkbox',
+        choices: _VelaAvdUtils.default.vvdManager.getVvdList().map(item => {
+          return {
+            name: item.name,
+            value: item.name
+          };
+        })
+      }],
+      action: async option => {
+        const {
+          avdNames
+        } = option;
+        avdNames.forEach(avdName => {
+          _VelaAvdUtils.default.vvdManager.deleteVvd(avdName);
+        });
+      }
+    }, {
+      name: 'initEmulatorEnv',
+      description: 'init/reset emulator environment',
+      action: async () => {
+        _VelaAvdUtils.default.initEmulatorEnv();
+      }
+    }]
+  };
+  _commander.Command.registeProgram(config);
 }
-main();
+main();

package/lib/builder/AndroidUxBuilder.js

@@ -1,20 +1,19 @@
 "use strict";
-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 UxBuilderBase_1 = __importDefault(require("./UxBuilderBase"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _UxBuilderBase = _interopRequireDefault(require("./UxBuilderBase"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * AndroidUxBuilder
  */
-class AndroidUxBuilder extends UxBuilderBase_1.default {
-    constructor() {
-        super(...arguments);
-        this.params = [];
-    }
-    match(projectPath) {
-        return shared_utils_1.ProjectType.getProjectType(projectPath) === shared_utils_1.ProjectType.ANDDROID_UX;
-    }
+class AndroidUxBuilder extends _UxBuilderBase.default {
+  params = [];
+  match(projectPath) {
+    return _sharedUtils.ProjectType.getProjectType(projectPath) === _sharedUtils.ProjectType.ANDDROID_UX;
+  }
 }
-exports.default = AndroidUxBuilder;
+var _default = exports.default = AndroidUxBuilder;

package/lib/builder/IBuilder.d.ts

@@ -19,4 +19,10 @@ export default interface IBuilder<O = any> {
      * @param projectPath 项目目录
      */
     match(projectPath: string): boolean;
+    /**
+     * 释放资源
+     *
+     * 进程退出时调用
+     */
+    dispose(): void | Promise<void>;
 }

package/lib/builder/IBuilder.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";

package/lib/builder/UxBuilderBase.d.ts

@@ -1,23 +1,20 @@
-import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
-import { Dictionary } from '@aiot-toolkit/shared-utils';
+import { CompileMode, IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
+import IFileLaneEvents, { IFileLaneSuccessData } from 'file-lane/lib/interface/IFileLaneEvents';
+export interface IUxBuildOption {
+    watch?: boolean;
+    mode: CompileMode;
+}
 /**
  * UxBuilderBase
  */
-declare class UxBuilderBase<O extends Dictionary = any> {
-    events: {
-        onBuildSuccess?: (data: {
-            costTime: number;
-        }) => void;
-    };
+declare class UxBuilderBase<O extends IUxBuildOption = IUxBuildOption> {
+    events: IFileLaneEvents;
     /**
      * 配置文件
      */
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
-    constructor(events?: {
-        onBuildSuccess?: (data: {
-            costTime: number;
-        }) => void;
-    });
+    private fileLane?;
+    constructor(events?: IFileLaneEvents);
     /**
      * ux项目的build函数
      * @param projectPath 项目路径
@@ -25,6 +22,8 @@ declare class UxBuilderBase<O extends Dictionary = any> {
      * @param watch 是否开启监听
      */
     build(projectPath: string, options: O): Promise<void>;
+    private handleLogs;
+    dispose(): Promise<void>;
     /**
      * 获取build的编译配置
      * @param projectPath 项目路径
@@ -34,3 +33,4 @@ declare class UxBuilderBase<O extends Dictionary = any> {
     private readQuickAppConfig;
 }
 export default UxBuilderBase;
+export { IFileLaneEvents, IFileLaneSuccessData };