@aiot-toolkit/emulator 2.0.3-beta.6 → 2.0.3-beta.8

package/lib/instance/miwear.js

@@ -1,379 +1,102 @@
 "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;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const adbMiwt = __importStar(require("@miwt/adb"));
-const child_process_1 = require("child_process");
-const readline_1 = __importDefault(require("readline"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const ws_1 = __importStar(require("ws"));
-const Instance_1 = require("../typing/Instance");
-const utils_1 = require("../utils");
-const emulatorutil_1 = require("../emulatorutil");
-const common_1 = __importDefault(require("./common"));
-const MAX_RECONNECT_COUNT = 8;
+exports.default = void 0;
+var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
+var _path = _interopRequireDefault(require("path"));
+var _utils = require("../utils");
+var _common = _interopRequireDefault(require("./common"));
+var _emulatorutil = require("../emulatorutil");
+var _Vvd = require("../typing/Vvd");
+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 }; }
 /**
  * MiwearInstance
  * 针对 Vela正式版（4.0）的镜像
  */
-class MiwearInstance extends common_1.default {
-    constructor(params) {
-        super(params);
-        this.params = params;
-        this.appDir = '/data/quickapp/app';
-        this.reconnectCount = 0;
-    }
-    /**
-     * 1. 启动模拟器
-     * 2. 启动成功后，adb连接模拟器
-     * 3. 连接成功后，在模拟器中启动快应用
-     */
-    start(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.startOptions = options;
-            this.sn = `emulator-${this.startOptions.adbPort}`;
-            // 启动模拟器
-            yield this.startGoldfish(options);
-            // adb连接模拟器
-            const connected = yield this.isConnected();
-            if (connected) {
-                ColorConsole_1.default.info('### Emulator ### Goldfish emulator connected successfully');
-                // 如果是首次启动，创建server端监听事件
-                if (this.isFirstStart && this.startOptions.serverPort) {
-                    yield this.createWebsockeServer();
-                }
-                // 在模拟器中启动快应用
-                this.startupQuickApp(options);
-                this.isFirstStart = false;
-            }
-            else {
-                const msg = '### Emulator ### Failed to connect emulator, please check whether the adb is normal';
-                ColorConsole_1.default.throw(msg);
-                throw new Error(msg);
-            }
-        });
-    }
-    /**
-     * 启动模拟器
-     * 1. 通过options生成模拟器的启动命令
-     * 2. 执行启动命令
-     * 3. 判断模拟器是否启动成功
-     *    3.1 若disableNSH=true，输出流中匹配到/quickapp_rpk_installer_init|rpk installer init done/，认为模拟器启动成功了
-     *    3.2 若disableNSH=false，认为8s过后模拟器启动成功了
-     * @param options
-     * @returns
-     */
-    startGoldfish(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { origin = Instance_1.IStartOrigin.Terminal } = options;
-            // 启动模拟器的命令和参数
-            const cmd = emulatorutil_1.EmulatorCmd.createMiwerCmd(options, this.sdkHome, this.avdHome);
-            if (!cmd)
-                return;
-            const spawnArgs = cmd.split(' ');
-            const spawnBin = spawnArgs.shift();
-            ColorConsole_1.default.log(`### Emulator ### Start CMD miwear: ${cmd}`);
-            const func = this instanceof MiwearInstance ? emulatorutil_1.EmulatorLog.rpkIsStart : emulatorutil_1.EmulatorLog.devIsStart;
-            return new Promise((resolve) => {
-                var _a, _b;
-                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, {
-                    stdio: 'pipe',
-                    shell: true,
-                    cwd: this.sdkHome
-                });
-                if (origin === Instance_1.IStartOrigin.Terminal) {
-                    process.stdin.pipe(this.goldfishProcess.stdin);
-                }
-                // 利用 readline 接口可解决子进程日志换行的问题
-                this.stdoutReadline = readline_1.default.createInterface({
-                    input: this.goldfishProcess.stdout
-                });
-                this.stderrReadline = readline_1.default.createInterface({
-                    input: this.goldfishProcess.stderr
-                });
-                // 监听模拟器的退出事件
-                this.goldfishProcess.on('exit', (code) => {
-                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
-                    if (options.exitCallback) {
-                        options.exitCallback(code);
-                    }
-                });
-                // 监听错误流
-                (_a = this.stderrReadline) === null || _a === void 0 ? void 0 : _a.on('line', (data) => {
-                    const stderrCb = options.stderrCallback || console.log;
-                    stderrCb(data.toString());
-                });
-                // 监听输出流
-                (_b = this.stdoutReadline) === null || _b === void 0 ? void 0 : _b.on('line', (data) => {
-                    const msg = data.toString();
-                    const stdoutCb = options.stdoutCallback || console.log;
-                    stdoutCb(msg);
-                    // 应用安装成功，则启动它
-                    if (emulatorutil_1.EmulatorLog.inStallIsFinshe(msg)) {
-                        ColorConsole_1.default.info(`### Emulator ### Install quickapp successfully`);
-                        this.launchQuickapp();
-                    }
-                    // 匹配到，则认为模拟器启动成功
-                    if (func(msg)) {
-                        ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
-                        resolve();
-                    }
-                });
-            });
-        });
-    }
-    /**
-     * 在模拟器中启动快应用
-     * 1. 检查release目录是否有打包好的rpk
-     * 2. 检查当前是否为调试模式.
-     *    若是，将debugger_ip.cfg推到模拟器的/data/目录下
-     *    若否，则要删除模拟器中已有的data/debugger_ip.cfg
-     * 3. 调用installRpkToAppList将当前快应用安装到模拟器的应用列表中
-     * @param options
-     */
-    startupQuickApp(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { package: appPackageName } = this.projectInfo;
-            const releaseDir = this.isRpk
-                ? path_1.default.resolve(this.projectPath, '../')
-                : path_1.default.resolve(this.projectPath, ((_a = this.params.compilerOption) === null || _a === void 0 ? void 0 : _a.releasePath) || 'dist');
-            const files = fs_extra_1.default
-                .readdirSync(releaseDir)
-                .filter((item) => item.includes(appPackageName) && item.endsWith('.rpk'));
-            if (files.length === 0) {
-                ColorConsole_1.default.error(`### Emulator the rpk does not exist`);
-            }
-            const rpkPath = path_1.default.resolve(releaseDir, files[0]);
-            // 调试模式需要push一个文件至miwear中
-            if (options.devtool) {
-                const debuggerCfgFile = path_1.default.join(__dirname, '../static/debugger_ip.cfg');
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} push ${debuggerCfgFile} /data/debugger_ip.cfg`);
-            }
-            else {
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell rm /data/debugger_ip.cfg`);
-            }
-            this.pushAndInstall(rpkPath, this.appDir);
-            // this.launchQuickapp()
-        });
-    }
-    /**
-     * 将快应用安装到模拟器的应用列表
-     * 1. 使用adb push将打包好的rpk推到模拟器的/data/quickapp/app/
-     * 2. nsh中调用pm install命令安装应用
-     * @param rpkPath rpk的绝对目录
-     * @param targetDir 要将rpk放到模拟器的哪个目录下
-     */
-    pushAndInstall(rpkPath, targetDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { package: packageName } = this.projectInfo;
-            // 1. adb push应用的rpk
-            const targetPath = `${targetDir}/${packageName}.rpk`;
-            const pushCmd = `adb -s ${this.sn} push "${rpkPath}" ${targetPath}`;
-            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
-            yield adbMiwt.execAdbCmdAsync(pushCmd);
-            const installCmd = `adb -s ${this.sn} shell pm install ${targetPath}`;
-            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
-            yield adbMiwt.execAdbCmdAsync(installCmd);
-        });
-    }
-    /** 使用am start启动快应用 */
-    launchQuickapp() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { package: packageName } = this.projectInfo;
-            const startCmd = `adb -s ${this.sn} shell am start ${packageName}`;
-            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${startCmd}`);
-            adbMiwt.execAdbCmdAsync(startCmd);
-        });
-    }
-    /** 连接模拟器中的调试服务，创建debugSocket
-     * 主要用于热更新时，通过debugSocket通知调试服务更新页面
-     * 设置了重连机制，会重复连接8次
-     */
-    initDebugSocket() {
-        return new Promise((resolve, reject) => {
-            var _a;
-            if (this.debugSocket && this.debugSocket.OPEN) {
-                return resolve();
-            }
-            this.debugSocket = new ws_1.default(`ws://localhost:${(_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.debugPort}`);
-            this.debugSocket.onopen = () => {
-                ColorConsole_1.default.info(`### Emulator debugSocket connect success`);
-                return resolve();
-            };
-            this.debugSocket.onerror = (errorEvent) => {
-                var _a;
-                // 重连机制
-                (_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.terminate();
-                if (this.reconnectCount < MAX_RECONNECT_COUNT) {
-                    ColorConsole_1.default.info(`### Emulator the ${this.reconnectCount + 1}th time to reconnect debug server`);
-                    this.reconnectCount++;
-                    setTimeout(() => this.initDebugSocket(), 2000);
-                }
-                else {
-                    this.debugSocket = undefined;
-                    this.reconnectCount = 0;
-                    return reject(`### Emulator debugSocket connect failed, ${errorEvent.message}`);
-                }
-            };
-            this.debugSocket.onclose = (closeEvent) => {
-                this.debugSocket = undefined;
-                this.reconnectCount = 0;
-                ColorConsole_1.default.log(`### Emulator debugSocket connect close: ${closeEvent.reason}`);
-            };
-        });
-    }
-    /** 通知模拟器更新
-     * 1. 确保已经成功连接模拟器中的调试服务
-     * 2. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
-     * 3. 发送Page.reload命令给调试服务，通知更新
-     */
-    handleUpdate() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            try {
-                this.reconnectCount = 0;
-                yield this.initDebugSocket();
-                // 1. 将整包重新推到miwear中（TODO：增量更新）
-                yield this.pushBuild();
-                // 2. 下发CDP命令给调试服务告知刷新
-                if (((_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.readyState) === ws_1.default.OPEN) {
-                    (_b = this.debugSocket) === null || _b === void 0 ? void 0 : _b.send(JSON.stringify({ id: 10000, method: 'Page.reload', params: {} }));
-                }
-            }
-            catch (e) {
-                ColorConsole_1.default.error(`${e}`);
-            }
-        });
-    }
-    /** 热更新时push目录 */
-    pushBuild() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { package: appPackageName } = this.projectInfo;
-            // windows平台adb push时无法使用通配符，需另外处理;
-            // 项目路径包含空格时，无法通过加引号来使用 * 通配符
-            if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
-                const rmCmd = `adb -s ${this.sn} shell rm -r ${this.appDir}/${appPackageName}`;
-                yield adbMiwt.execAdbCmdAsync(rmCmd);
-                const sourcePath = path_1.default.resolve(this.projectPath, './build');
-                const pushCmd = `adb -s ${this.sn} push "${sourcePath}" ${this.appDir}/${appPackageName}`;
-                yield adbMiwt.execAdbCmdAsync(pushCmd);
-            }
-            else {
-                const sourcePath = path_1.default.resolve(this.projectPath, './build/*');
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} push ${sourcePath} ${this.appDir}/${appPackageName}`);
-            }
-            ColorConsole_1.default.info(`### Emulator push to ${this.appDir}/${appPackageName} successfully`);
-        });
-    }
-    /** 通过命令行启动时，在watich模式下监听websocket消息，
-     * 在文件发生变动时，重新启动应用
-     */
-    restart() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.pushAndReloadApp();
-        });
-    }
-    /** 在模拟器中重启快应用（基于am命令，需要保证镜像中已经有am功能）
-     * 1. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
-     * 2. nsh中执行am stop命令退出快应用
-     * 3. nsh中执行am start命令启动快应用
-     */
-    pushAndReloadApp() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // 1. 将整包重新推到miwear中（TODO：增量更新）
-            yield this.pushBuild();
-            yield this.reloadApp();
-        });
-    }
-    reloadApp() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const { package: appPackageName } = this.projectInfo;
-                // 2. 执行am stop和am start命令
-                const stopCmd = `adb -s ${this.sn} shell am stop ${appPackageName}`;
-                yield adbMiwt.execAdbCmdAsync(stopCmd);
-                ColorConsole_1.default.info(`### Emulator stop ${appPackageName} successfully`);
-                // 这里是为了等am stop命令清除资源等
-                yield (0, utils_1.sleep)(500);
-                const startCmd = `adb -s ${this.sn} shell am start ${appPackageName}`;
-                yield adbMiwt.execAdbCmdAsync(startCmd);
-                ColorConsole_1.default.info(`### Emulator start ${appPackageName} successfully`);
-            }
-            catch (e) {
-                ColorConsole_1.default.error(`${e}`);
-            }
-        });
+class MiwearInstance extends _common.default {
+  imageType = (() => _Vvd.VelaImageType.REL)();
+  appDir = '/data/quickapp/app';
+
+  /**
+   * 使用 pm 安装快应用
+   * @param targeRpk 快应用的rpk文件路径
+   */
+  async install(targeRpk) {
+    adbMiwt.execAdbCmd(`adb -s ${this.sn} shell pm install ${targeRpk}`);
+    return new Promise((resolve, reject) => {
+      const func = msg => {
+        if (_emulatorutil.EmulatorLog.inStallIsFinshe(msg)) {
+          clearTimeout(timer);
+          _ColorConsole.default.info(`### Emulator ### Install ${targeRpk} successfully`);
+          resolve();
+        }
+      };
+      let timer = setTimeout(() => {
+        this.stdoutReadline.off('line', func);
+        _ColorConsole.default.error(`### Emulator ### Install ${targeRpk} timeout`);
+        reject('Install timeout');
+      }, 2 * 60 * 1000);
+      this.stdoutReadline.on('line', func);
+    });
+  }
+
+  /** 使用 am start 启动快应用 */
+  async startApp(packageName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    // 调试模式需要push一个文件至miwear中
+    if (debug) {
+      const debuggerCfgFile = _path.default.join(__dirname, '../static/debugger_ip.cfg');
+      await adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} push ${debuggerCfgFile} /data/debugger_ip.cfg`);
+    } else {
+      await adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell rm /data/debugger_ip.cfg`);
     }
-    /**
-     * 创建server端，监听打包过程中client端发来的消息
-     */
-    createWebsockeServer() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const wsServer = new ws_1.WebSocketServer({
-                port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort
-            });
-            wsServer.on('connection', (socket) => {
-                ColorConsole_1.default.success(`### App Socket server ### Websocket connects to websocket server`);
-                socket.on('error', (err) => {
-                    ColorConsole_1.default.error(`### App Socket server ### Websocket server error: ${err.message}`);
-                });
-                // data的格式：{ type: string, data: any }
-                socket.on('message', (data) => __awaiter(this, void 0, void 0, function* () {
-                    var _a;
-                    const message = JSON.parse(data.toString());
-                    ColorConsole_1.default.log(`### App Socket server ### Websocket server get data: ${data}`);
-                    if (message.type === 'restart') {
-                        // 非调试模式下无法热更新
-                        if (!((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.devtool)) {
-                            this.restart();
-                            return;
-                        }
-                        this.handleUpdate();
-                    }
-                    else if (message.type === 'stop') {
-                        this.stop();
-                    }
-                }));
-            });
-        });
+    const startCmd = `adb -s ${this.sn} shell am start ${packageName}`;
+    _ColorConsole.default.info(`### Emulator ### Excuting cmd: ${startCmd}`);
+    await adbMiwt.execAdbCmdAsync(startCmd);
+  }
+  async closeApp(appName) {
+    const stopCmd = `adb -s ${this.sn} shell am stop ${appName}`;
+    await adbMiwt.execAdbCmdAsync(stopCmd);
+    _ColorConsole.default.info(`### Emulator stop ${appName} successfully`);
+    // 这里是为了等am stop命令清除资源等
+  }
+  async reboot() {
+    await super.reboot();
+    return new Promise((resolve, reject) => {
+      const func = msg => {
+        if (_emulatorutil.EmulatorLog.rpkIsStart(msg)) {
+          clearTimeout(timer);
+          resolve();
+        }
+      };
+      let timer = setTimeout(() => {
+        this.stdoutReadline.off('line', func);
+        _ColorConsole.default.error(`### Emulator ### reboot  timeout`);
+        reject('reboot timeout');
+      }, 2 * 60 * 1000);
+      this.stdoutReadline.on('line', func);
+    });
+  }
+  async reloadApp(appPackageName) {
+    let _debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    try {
+      // 2. 执行am stop和am start命令
+      const stopCmd = `adb -s ${this.sn} shell am stop ${appPackageName}`;
+      await adbMiwt.execAdbCmdAsync(stopCmd);
+      _ColorConsole.default.info(`### Emulator stop ${appPackageName} successfully`);
+      // 这里是为了等am stop命令清除资源等
+      await (0, _utils.sleep)(500);
+      const startCmd = `adb -s ${this.sn} shell am start ${appPackageName}`;
+      await adbMiwt.execAdbCmdAsync(startCmd);
+      _ColorConsole.default.info(`### Emulator start ${appPackageName} successfully`);
+    } catch (e) {
+      _ColorConsole.default.error(`${e}`);
     }
+  }
 }
-exports.default = MiwearInstance;
+var _default = exports.default = MiwearInstance;

package/lib/instance/pre.d.ts

@@ -1,11 +1,19 @@
 import GoldfishInstance from './dev';
+import { VelaImageType } from '../typing/Vvd';
 /**
  * 不带 miwear 的 4.0 镜像
  */
 declare class PreInstance extends GoldfishInstance {
+    imageType: VelaImageType;
     appDir: string;
-    pushRpk(rpkPath?: string): Promise<string>;
-    installApp(rpkPath?: string): Promise<void>;
-    pushAndInstall(rpkPath?: string): Promise<void>;
+    install(rpkPath: string, appPackageName?: string): Promise<void>;
+    /**
+     * 在模拟器中启动快应用
+     * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
+     * @param options
+     */
+    startApp(packageName: string, debug?: boolean): Promise<void>;
+    closeApp(_appName: string): Promise<void>;
+    reloadApp(appName: string, debug?: boolean): Promise<void>;
 }
 export default PreInstance;