aiot-toolkit 2.0.3-beta.6 → 2.0.3-beta.8

package/lib/starter/VelaUxStarter.js

@@ -1,205 +1,164 @@
 "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 emulator_1 = require("@aiot-toolkit/emulator");
-const constants_1 = require("@aiot-toolkit/emulator/lib/emulatorutil/constants");
-const index_1 = require("@aiot-toolkit/emulator/lib/utils/index");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const prompts_1 = require("@inquirer/prompts");
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const portfinder_1 = __importDefault(require("portfinder"));
-const VelaUxBuilder_1 = __importDefault(require("../builder/VelaUxBuilder"));
-const VelaAvdUtils_1 = __importDefault(require("../utils/VelaAvdUtils"));
-const IStarter_1 = __importDefault(require("./IStarter"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const ws_1 = __importDefault(require("ws"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _emulator = require("@aiot-toolkit/emulator");
+var _constants = require("@aiot-toolkit/emulator/lib/emulatorutil/constants");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _prompts = require("@inquirer/prompts");
+var _path = _interopRequireDefault(require("path"));
+var _portfinder = _interopRequireDefault(require("portfinder"));
+var _VelaUxBuilder = _interopRequireWildcard(require("../builder/VelaUxBuilder"));
+var _VelaAvdUtils = _interopRequireDefault(require("../utils/VelaAvdUtils"));
+var _IStarter = _interopRequireDefault(require("./IStarter"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _aiotpack = require("@aiot-toolkit/aiotpack");
+var _events = _interopRequireDefault(require("events"));
+var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * VelaUxStarter
  * ux快应用启动器
  */
-class VelaUxStarter extends IStarter_1.default {
-    constructor() {
-        super(...arguments);
-        this.builder = new VelaUxBuilder_1.default({
-            onBuildSuccess: (data) => {
-                var _a;
-                shared_utils_1.ColorConsole.info(`build time: ${data.costTime}ms`);
-                if (this.ws) {
-                    this.ws.send(JSON.stringify({
-                        type: 'restart'
-                    }));
-                }
-                else {
-                    (_a = this.currentGoldfishInstance) === null || _a === void 0 ? void 0 : _a.restart();
-                }
-            }
-        });
-        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'
-            },
-            {
-                type: 'confirm',
-                name: 'open-nuttx',
-                description: 'deprecated',
-                deprecated: 'please remove it now',
-                deprecatedVersion: '2.1.0'
-            },
-            ...this.builder.params
-        ];
+class VelaUxStarter extends _IStarter.default {
+  constructor(name, description) {
+    super(name, description);
+    this.name = name;
+    this.description = description;
+    this.event = new _events.default();
+    this.builder = new _VelaUxBuilder.default({
+      onBuildSuccess: data => {
+        this.lastRpk = data.info?.rpk;
+        this.event.emit('buildSuccess', data);
+      }
+    });
+  }
+  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'
+  }, {
+    type: 'confirm',
+    name: 'open-nuttx',
+    description: 'deprecated',
+    deprecated: 'please remove it now',
+    deprecatedVersion: '2.1.0'
+  }, ..._VelaUxBuilder.velaUxBuilderParams])();
+  async start(projectPath, options) {
+    const check = await _VelaAvdUtils.default.checkEmulatorEnv();
+    if (!check) {
+      const errorMsg = 'Your Vela emulator is not ready. Please use the `npx aiot initEmulatorEnv` command to initialize the emulator environment.';
+      _sharedUtils.ColorConsole.throw(errorMsg);
+      throw new Error(errorMsg);
+    }
+    // 获取已经创建的模拟器列表
+    const vvdList = _VelaAvdUtils.default.vvdManager.getVvdList();
+    let vvdName;
+    if (vvdList.length === 0) {
+      _sharedUtils.ColorConsole.error('no vela emulator available, please create it first.');
+      _VelaAvdUtils.default.createVelaVvdByInquire();
+      return;
+    } else if (vvdList.length === 1) {
+      const needtoRun = await (0, _prompts.confirm)({
+        message: 'there is only one emulator, need to Run?',
+        default: true
+      });
+      if (!needtoRun) {
+        _VelaAvdUtils.default.createVelaVvdByInquire();
+        return;
+      }
+      vvdName = vvdList[0].name;
+      _sharedUtils.ColorConsole.warn(`Start run by :${vvdName} `);
+    } else {
+      vvdName = await (0, _prompts.select)({
+        message: 'name of the avd to start',
+        choices: vvdList.map(item => {
+          return {
+            value: item.name
+          };
+        })
+      });
+    }
+    // 检查选择的模拟器是否符合要求
+    if (vvdName && !this.isAvailableEmulator(vvdName)) {
+      _sharedUtils.ColorConsole.throw(`this emulator is unavailable, please create a new emulator.`);
+      return;
     }
-    start(projectPath, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // 获取已经创建的模拟器列表
-            const avdList = VelaAvdUtils_1.default.velaAvdCls.getVelaAvdList();
-            let avdName;
-            if (avdList.length === 0) {
-                shared_utils_1.ColorConsole.error('no vela emulator available, please create it first.');
-                VelaAvdUtils_1.default.createVelaAvdByInquire();
-                return;
-            }
-            else if (avdList.length === 1) {
-                const needtoRun = yield (0, prompts_1.confirm)({
-                    message: 'there is only one emulator, need to Run?',
-                    default: true
-                });
-                if (!needtoRun) {
-                    VelaAvdUtils_1.default.createVelaAvdByInquire();
-                    return;
-                }
-                avdName = avdList[0].avdName;
-                shared_utils_1.ColorConsole.warn(`Start run by :${avdName} `);
-            }
-            else {
-                avdName = yield (0, prompts_1.select)({
-                    message: 'name of the avd to start',
-                    choices: avdList.map((item) => {
-                        return { value: item.avdName };
-                    })
-                });
-            }
-            // 检查选择的模拟器是否符合要求
-            if (avdName && !this.isAvailableEmulator(avdName)) {
-                shared_utils_1.ColorConsole.throw(`this emulator is unavailable, please create a new emulator.`);
-                return;
-            }
-            let serverPort;
-            // watch模型下开启server
-            serverPort = yield portfinder_1.default.getPortPromise({
-                port: aiotpack_1.JavascriptDefaultCompileOption.serverPort
-            });
-            (0, aiotpack_1.setServerPort)(serverPort);
-            // build
-            const compilerOption = this.builder.getCompilerOption(projectPath, options);
-            yield this.builder.build(projectPath, options);
-            // start
-            const params = {
-                sdkHome: path_1.default.resolve(os_1.default.homedir(), '.export'),
-                avdHome: path_1.default.resolve(os_1.default.homedir(), '.android/avd'),
-                projectPath,
-                compilerOption
-            };
-            // 寻找对应的模拟器instance
-            this.currentGoldfishInstance = (0, emulator_1.findInstance)(avdName, params);
-            if (!this.currentGoldfishInstance) {
-                shared_utils_1.ColorConsole.throw('no corresponding emulator found, please recreate it');
-                return;
-            }
-            let grpcPort;
-            // 设置vncPort
-            if (options.openVNC) {
-                grpcPort = yield portfinder_1.default.getPortPromise({
-                    port: constants_1.defaultVncPort,
-                    stopPort: constants_1.defaultVncPort + 100
-                });
-            }
-            // 设置adbPort
-            const adbPort = yield (0, index_1.getEvenPort)();
-            if (!adbPort) {
-                shared_utils_1.ColorConsole.throw(`${adbPort},the port numbers between 5555 and 5585 are all occupied. please resolve the port conflict before starting the emulator`);
-                return;
-            }
-            // 设置debugPort
-            let debugPort;
-            if (options.devtool) {
-                debugPort = yield portfinder_1.default.getPortPromise({ port: constants_1.defaultDebugPort });
-            }
-            const startOptions = {
-                avdName,
-                devtool: options.devtool,
-                disableNSH: options.disableNSH,
-                serverPort,
-                grpcPort,
-                adbPort,
-                debugPort
-            };
-            yield this.currentGoldfishInstance.start(startOptions);
-            this.ws = new ws_1.default(`ws://localhost:${serverPort}`);
-            // waiter
-            // const startWaiter: PersistentCommand = new PersistentCommand({
-            //   description: 'aiot-toolkit start 的常驻命令',
-            //   options: [
-            //     {
-            //       key: '?',
-            //       description: '显示所有命令',
-            //       action() {
-            //         startWaiter.clearLog()
-            //         startWaiter.describe()
-            //       }
-            //     }
-            //   ]
-            // })
-            // startWaiter.describe()
-            // startWaiter.start()
-        });
+
+    // build
+    const compilerOption = this.builder.getCompilerOption(projectPath, options);
+    // start build
+    await this.builder.build(projectPath, options);
+
+    // 设置 debugPort
+    let debugPort;
+    if (options.devtool) {
+      debugPort = await _portfinder.default.getPortPromise({
+        port: _constants.defaultDebugPort
+      });
     }
-    /**
-     * 检查选择的模拟器在当前环境下是否可以使用
-     * 下面的几种情况会导致模拟器不可用：1. 模拟器绑定的Vela镜像不存在；2. Vela4.0缺少coredump.core或者vela_data.bin文件
-     * @param avdName 模拟器名称
-     * @returns {boolean}
-     */
-    isAvailableEmulator(avdName) {
-        const { avdImagePath } = VelaAvdUtils_1.default.velaAvdCls.getVelaAvdInfo(avdName);
-        // 没有avdImagePath，即对应的configIni里没有 image.sysdir.1 字段
-        // 有avdImagePath，但是这个目录下没有nuttx
-        if (!avdImagePath || !fs_extra_1.default.existsSync(path_1.default.resolve(avdImagePath, 'nuttx'))) {
-            return false;
-        }
-        if (avdImagePath.includes('vela-release') &&
-            (!fs_extra_1.default.existsSync(path_1.default.resolve(avdImagePath, 'coredump.core')) ||
-                !fs_extra_1.default.existsSync(path_1.default.resolve(avdImagePath, 'vela_data.bin')))) {
-            return false;
-        }
-        return true;
+
+    // start emulator
+    const startRes = await _VelaAvdUtils.default.vvdManager.startVvd({
+      vvdName,
+      origin: _emulator.IStartOrigin.Terminal,
+      debugPort
+    });
+    this.emulatorInstance = startRes.emulatorInstance;
+    if (!this.emulatorInstance) {
+      throw new Error('emulatorInstance is undefined');
+    }
+    const projectInfo = _aiotpack.UxFileUtils.getMainfestInfo(projectPath, compilerOption.sourceRoot);
+    if (this.lastRpk && _fsExtra.default.existsSync(this.lastRpk)) {
+      const targetPath = await this.emulatorInstance?.pushRpk(this.lastRpk, projectInfo.package);
+      await this.emulatorInstance?.install(targetPath);
+      await this.emulatorInstance?.startApp(projectInfo.package, options.devtool);
+    }
+    this.event.on('buildSuccess', async data => {
+      if (data.info?.diffFile) {
+        const targetPath = `/data/tmp/${projectInfo.package}`;
+        await this.emulatorInstance?.push(data.info.diffFile, targetPath);
+        await this.emulatorInstance?.unzip(targetPath, `${this.emulatorInstance.appDir}/${projectInfo.package}`);
+        await this.emulatorInstance?.reloadApp(projectInfo.package);
+      } else if (data.info?.trigger === _FileLaneTriggerType.default.START && data.info.rpk) {
+        const targetPath = await this.emulatorInstance?.pushRpk(data.info.rpk, projectInfo.package);
+        await this.emulatorInstance?.install(targetPath);
+        await this.emulatorInstance?.startApp(projectInfo.package, options.devtool);
+      }
+    });
+  }
+
+  /**
+   * 检查选择的模拟器在当前环境下是否可以使用
+   * 下面的几种情况会导致模拟器不可用：1. 模拟器绑定的Vela镜像不存在；2. Vela4.0缺少coredump.core或者vela_data.bin文件
+   * @param avdName 模拟器名称
+   * @returns {boolean}
+   */
+  isAvailableEmulator(avdName) {
+    const {
+      imageDir
+    } = _VelaAvdUtils.default.vvdManager.getVvdInfo(avdName);
+    // 没有avdImagePath，即对应的configIni里没有 image.sysdir.1 字段
+    // 有avdImagePath，但是这个目录下没有nuttx
+    if (!imageDir || !_fsExtra.default.existsSync(_path.default.resolve(imageDir, 'nuttx'))) {
+      return false;
     }
+    return true;
+  }
 }
-exports.default = VelaUxStarter;
+var _default = exports.default = VelaUxStarter;

package/lib/starter/XtsStarter.js

@@ -1,19 +1,18 @@
 "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) {
-        console.log(projectPath, options);
-        throw new Error('Method not implemented.');
-    }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _XtsBuilder = _interopRequireDefault(require("../builder/XtsBuilder"));
+var _IStarter = _interopRequireDefault(require("./IStarter"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+class XtsStarter extends _IStarter.default {
+  builder = (() => new _XtsBuilder.default())();
+  params = [];
+  start(projectPath, options) {
+    console.log(projectPath, options);
+    throw new Error('Method not implemented.');
+  }
 }
-exports.default = XtsStarter;
+var _default = exports.default = XtsStarter;

package/lib/starter/androidRouter/LinkMode.js

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