aiot-toolkit 2.0.2-dev.7 → 2.0.2

package/lib/bin.js

@@ -13,18 +13,19 @@ 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';
+const NODE_MINIMUM_VERSION = '18.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 UxBuilder_1 = __importDefault(require("./builder/UxBuilder"));
+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 UxStarter_1 = __importDefault(require("./starter/UxStarter"));
+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"));
@@ -32,23 +33,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: {
-        builder: UxBuilder_1.default,
-        starter: UxStarter_1.default
+    [shared_utils_2.ProjectType.VELA_UX]: {
+        builder: VelaUxBuilder_1.default,
+        starter: VelaUxStarter_1.default
     },
-    xts: {
+    [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
     }
 };
 function findBuilder() {
-    const projectType = getProjectType();
+    const projectType = shared_utils_2.ProjectType.getProjectType(process.cwd());
     return new projectMapper[projectType].builder();
 }
 function build(command, description) {
@@ -59,27 +64,22 @@ function build(command, description) {
         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;
-            const projectPath = process.cwd();
-            yield builder.build(projectPath, option);
+            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'
+                });
+            }
         })
     };
 }
-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() {
@@ -92,28 +92,16 @@ function main() {
                 build('build', 'build project'),
                 build('release', 'release the project'),
                 findStarter('start', 'start project').getCommond(),
-                {
-                    name: 'watch',
-                    description: 'recompile project while file changes',
-                    action: (option) => __awaiter(this, void 0, void 0, function* () {
-                        const projectPath = process.cwd();
-                        const builder = findBuilder();
-                        option.watch = true;
-                        yield builder.build(projectPath, option);
-                        // waiter.describe()
-                        // waiter.start()
-                    })
-                },
                 {
                     name: 'getConnectedDevices',
                     description: 'get all connected devices',
                     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 +150,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'
+                            });
                         }
                     })
                 },
@@ -196,6 +186,13 @@ function main() {
                             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();
+                    })
                 }
             ]
         };

package/lib/builder/AndroidUxBuilder.d.ts

@@ -0,0 +1,10 @@
+import { IParam } from '@aiot-toolkit/commander';
+import UxBuilderBase from './UxBuilderBase';
+/**
+ * AndroidUxBuilder
+ */
+declare class AndroidUxBuilder extends UxBuilderBase {
+    params: IParam[];
+    match(projectPath: string): boolean;
+}
+export default AndroidUxBuilder;

package/lib/builder/AndroidUxBuilder.js

@@ -0,0 +1,20 @@
+"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"));
+/**
+ * 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;
+    }
+}
+exports.default = AndroidUxBuilder;

package/lib/builder/UxBuilderBase.d.ts

@@ -0,0 +1,36 @@
+import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
+/**
+ * UxBuilderBase
+ */
+declare class UxBuilderBase<O extends Dictionary = any> {
+    events: {
+        onBuildSuccess?: (data: {
+            costTime: number;
+        }) => void;
+    };
+    /**
+     * 配置文件
+     */
+    readonly QUICKAPP_CONFIG = "quickapp.config.js";
+    constructor(events?: {
+        onBuildSuccess?: (data: {
+            costTime: number;
+        }) => void;
+    });
+    /**
+     * ux项目的build函数
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     * @param watch 是否开启监听
+     */
+    build(projectPath: string, options: O): Promise<void>;
+    /**
+     * 获取build的编译配置
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     */
+    getCompilerOption(projectPath: string, options: O): Partial<IJavascriptCompileOption>;
+    private readQuickAppConfig;
+}
+export default UxBuilderBase;

package/lib/builder/UxBuilderBase.js

@@ -0,0 +1,105 @@
+"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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+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 path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const lodash_1 = __importDefault(require("lodash"));
+const file_lane_1 = __importDefault(require("file-lane"));
+/**
+ * UxBuilderBase
+ */
+class UxBuilderBase {
+    constructor(events = {
+        onBuildSuccess: (data) => shared_utils_1.ColorConsole.info(`build time: ${data.costTime}ms`)
+    }) {
+        this.events = events;
+        /**
+         * 配置文件
+         */
+        this.QUICKAPP_CONFIG = 'quickapp.config.js';
+    }
+    /**
+     * ux项目的build函数
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     * @param watch 是否开启监听
+     */
+    build(projectPath, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const watch = options.watch || false;
+            // 项目配置
+            const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
+            // 编译配置
+            const compilerOption = this.getCompilerOption(projectPath, options);
+            shared_utils_1.ColorConsole.info('start build: ', {
+                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.INFO),
+                word: JSON.stringify({
+                    projectPath,
+                    options,
+                    watch,
+                    node: process.version,
+                    platform: process.platform,
+                    arch: process.arch,
+                    toolkit: require('../../package.json').version
+                }, null, 2)
+            });
+            // 开始编译项目
+            yield new file_lane_1.default(uxProjectConfig, projectPath, compilerOption, this.events).start({ watch });
+        });
+    }
+    /**
+     * 获取build的编译配置
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     */
+    getCompilerOption(projectPath, options) {
+        // 读取项目中文件的配置
+        const quickappConfig = this.readQuickAppConfig(projectPath);
+        const _a = quickappConfig || {}, { cli } = _a, otherConfig = __rest(_a, ["cli"]);
+        options = lodash_1.default.merge({}, options, cli);
+        // 项目配置
+        const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
+        // 编译配置
+        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 }), otherConfig);
+        return compilerOption;
+    }
+    readQuickAppConfig(projectPath) {
+        const path = path_1.default.join(projectPath, this.QUICKAPP_CONFIG);
+        if (fs_extra_1.default.existsSync(path)) {
+            try {
+                const data = require(path);
+                return data;
+            }
+            catch (error) {
+                shared_utils_1.ColorConsole.throw((error === null || error === void 0 ? void 0 : error.toString()) || '');
+            }
+        }
+        return;
+    }
+}
+exports.default = UxBuilderBase;

package/lib/builder/VelaUxBuilder.d.ts

@@ -0,0 +1,23 @@
+import { CompileMode } from '@aiot-toolkit/aiotpack';
+import { IParam } from '@aiot-toolkit/commander';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
+import IBuilder from './IBuilder';
+import UxBuilderBase from './UxBuilderBase';
+interface IUxBuilderOption extends Dictionary {
+    watch?: boolean;
+    mode: CompileMode;
+    enableJsc: boolean;
+    enableE2e?: boolean;
+    /**
+     * 是否自动补全 manifest.json 中的 features 配置
+     */
+    completeFeature?: boolean;
+}
+/**
+ * VelaUxBuilder
+ */
+declare class VelaUxBuilder extends UxBuilderBase<IUxBuilderOption> implements IBuilder<IUxBuilderOption> {
+    params: IParam[];
+    match(projectPath: string): boolean;
+}
+export default VelaUxBuilder;

package/lib/builder/VelaUxBuilder.js

@@ -0,0 +1,66 @@
+"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"));
+/**
+ * VelaUxBuilder
+ */
+class VelaUxBuilder extends UxBuilderBase_1.default {
+    constructor() {
+        super(...arguments);
+        this.params = [
+            {
+                type: 'string',
+                name: 'devtool',
+                description: 'source map config'
+            },
+            {
+                name: 'disable-subpackages',
+                description: 'disable subpackages'
+            },
+            {
+                type: 'confirm',
+                name: 'enable-jsc',
+                description: 'enable jsc bundle',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'enable-protobuf',
+                description: 'enable protobuf',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'enable-e2e',
+                description: 'inject test-suite for current project',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'enable-stats',
+                description: 'analyse time and size of webpack output files',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                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
+            }
+        ];
+    }
+    match(projectPath) {
+        return shared_utils_1.ProjectType.getProjectType(projectPath) === shared_utils_1.ProjectType.VELA_UX;
+    }
+}
+exports.default = VelaUxBuilder;

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;
                 }
@@ -50,30 +47,30 @@ class XtsBuilder {
         return fs_1.default.existsSync(path_1.default.resolve(projectPath, 'app/app.xts'));
     }
     build(projectPath, options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             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);
-                const preWorks = config.preWorks || [];
+                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.beforeCompile || [];
                 for (let item of preWorks) {
                     try {
-                        yield item(context, [], config, compilerOptions);
+                        yield item({ context, config, compilerOption: compilerOptions });
                     }
                     catch (error) {
                         // 报错 prework的item error
                     }
                 }
-                const follWorks = config.followWorks || [];
+                const follWorks = config.afterCompile || [];
                 for (let item of follWorks) {
                     try {
-                        yield item(context, config, compilerOptions);
+                        yield item.worker({ context, config, compilerOption: compilerOptions });
                     }
                     catch (error) {
                         // 报错 prework的item error

package/lib/interface/VelaEmulatorInterface.d.ts

@@ -1,13 +1,14 @@
-export interface ISystemImagesVersionInfo {
-    release: string;
-    dev: string;
-}
-export type ISystemImagesType = keyof ISystemImagesVersionInfo;
 export interface IGoldfishVersionInfo {
     name: string;
     emulator: string;
-    'system-images': ISystemImagesVersionInfo;
+    'system-images': string;
     qa: string;
     skins: string;
     tools: string;
+    modem_simulator: string;
+}
+export interface IVelaImageItem {
+    label: string;
+    value: string;
+    time: string | Date;
 }

package/lib/starter/AndroidUxStart.d.ts

@@ -0,0 +1,40 @@
+import { IParam, PersistentCommand } from '@aiot-toolkit/commander';
+import IStarter from './IStarter';
+/**
+ * AndroidUxStart
+ *
+ * 1. 启动本机开发者http服务器，并提供二维码，以下载 rpk
+ * 2. 打包 rpk，并监听文件变化，重新打包
+ */
+declare class AndroidUxStart extends IStarter {
+    private server?;
+    private port?;
+    private builder;
+    private projectPath;
+    params: IParam[];
+    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;