@aiot-toolkit/emulator 2.0.3-beta.1 → 2.0.3-beta.11

package/lib/instance/common.js

@@ -1,230 +1,160 @@
 "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 UxFileUtils_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/utils/ux/UxFileUtils"));
-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 fs_extra_1 = __importDefault(require("fs-extra"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const ws_1 = require("ws");
-const avd_1 = __importDefault(require("../avd"));
-const constants_1 = require("../emulatorutil/constants");
-const utils_1 = require("../utils");
-/**
- * CommonInstance
- */
-class CommonInstance {
-    constructor(params) {
-        this.quickappStartedFlag = /Start App loop/;
-        this.isFirstStart = true;
-        this.isDistributedApp = false;
-        this.projectPath = params.projectPath;
-        this.sdkHome = params.sdkHome || constants_1.defaultSDKHome;
-        this.avdHome = params.avdHome || constants_1.defaultAvdHome;
-        this.isRpk = params.sourceRoot === './';
-        const projectJsonFile = path_1.default.resolve(this.projectPath, '.project.json');
-        const projectJsonExist = fs_extra_1.default.existsSync(projectJsonFile);
-        if (projectJsonExist) {
-            const projectJsonInfo = fs_extra_1.default.readJSONSync(projectJsonFile);
-            this.isDistributedApp = projectJsonInfo.projectType === 'distributed';
-        }
-        this.velaAvdCls = new avd_1.default({
-            sdkHome: this.sdkHome,
-            avdHome: this.avdHome
-        });
-        this.projectInfo = UxFileUtils_1.default.getMainfestInfo(this.projectPath, params.sourceRoot);
-    }
-    /** 获取模拟器二进制文件所在位置 */
-    getEmulatorBinPath() {
-        const osPlatform = os_1.default.platform();
-        const arch = (0, utils_1.getSystemArch)();
-        const platform = osPlatform === 'win32' ? 'windows' : osPlatform;
-        const emulatorHome = path_1.default.resolve(this.sdkHome, 'emulator');
-        return path_1.default.resolve(emulatorHome, `${platform}-${arch}`, 'emulator');
-    }
-    /** 在goldfish模拟器中运行快应用 */
-    start(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error(`start method not implemented, ${options}`);
+exports.default = void 0;
+var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+var _ILog = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
+var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
+var _utils = require("../utils");
+var _logcat = require("../vvd/logcat");
+var _emulatorutil = require("../emulatorutil");
+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 }; }
+class CommonEmulatorInstance {
+  appDir = '/data/quickapp/app';
+  quickappStartedFlag = /Start App loop/;
+  constructor(params) {
+    this.sn = `emulator-${params.serialPort}`;
+    this.vvdName = params.vvdName;
+    this.onStdout = params.onStdout || console.log;
+    this.onErrout = params.onErrout || console.error;
+    this.debugPort = params.debugPort || (0, _emulatorutil.getRunningVvdDebugPort)(this.vvdName);
+    if (params.customLogger) {
+      this.logger = msg => {
+        const prefix = _ColorConsole.default.createDefaultPrefix({
+          level: _ILog.Loglevel.INFO,
+          message: msg
         });
+        params.customLogger(`${prefix[1]} ${msg?.trim()}`);
+      };
+    } else {
+      this.logger = _ColorConsole.default.info;
     }
-    /**
-     * 判断模拟器是否 ready
-     */
-    isConnected() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, utils_1.tryRun)(() => __awaiter(this, void 0, void 0, function* () {
-                const devices = yield adbMiwt.getAdbDevices();
-                ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
-                const curDev = devices.find((t) => t.sn === this.sn);
-                return (curDev === null || curDev === void 0 ? void 0 : curDev.status) === 'device';
-            }), 10, 500);
-        });
+    if (params.logcatProcess) {
+      this.logcatProcess = params.logcatProcess;
+      if (!params.stdoutReadline || !params.stderrReadline) {
+        const readlines = (0, _logcat.attachReadline)(params.logcatProcess, this.onStdout, this.onErrout);
+        params.stdoutReadline = readlines.stdoutReadline;
+        params.stderrReadline = readlines.stderrReadline;
+        params.dispose = readlines.dispose;
+      }
+      this.stdoutReadline = params.stdoutReadline;
+      this.stderrReadline = params.stderrReadline;
+      this.disposeReadlines = params.dispose;
+    } else {
+      const r = (0, _logcat.creatLogcat)(this.sn, this.onStdout, this.onErrout);
+      this.logcatProcess = r.logcatProcess;
+      this.stdoutReadline = r.stdoutReadline;
+      this.stderrReadline = r.stderrReadline;
+      this.disposeReadlines = r.dispose;
     }
-    /**
-     * 通过adb连接模拟器。
-     * 时间限制为 @param timeout 秒，超时则表示连接失败
-     * @returns
-     */
-    connectGoldfish() {
-        return __awaiter(this, arguments, void 0, function* (timeout = 10) {
-            let adbConnected = false; // adb是否连接成功
-            let enableLoop = true; // 是否允许循环，用于终止adb的连接
-            let needKill = false;
-            const connectFn = () => __awaiter(this, void 0, void 0, function* () {
-                while (enableLoop && !adbConnected) {
-                    if (needKill) {
-                        const adbKillCmd = `adb kill-server`;
-                        ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
-                        yield adbMiwt.execAdbCmdAsync(adbKillCmd);
-                    }
-                    const str = yield this.connectDevice();
-                    ColorConsole_1.default.log(`### Emulator ### ${str}`);
-                    // 查询模拟器的状态是否为“device”
-                    const devices = yield adbMiwt.getAdbDevices();
-                    ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
-                    const curDev = devices.find((t) => t.sn === this.sn);
-                    if ((curDev === null || curDev === void 0 ? void 0 : curDev.status) === 'offline')
-                        needKill = true;
-                    adbConnected = devices.some((item) => item.sn === this.sn && item.status === 'device');
-                }
-                return Promise.resolve(adbConnected);
-            });
-            const res = yield Promise.race([
-                connectFn(),
-                new Promise((resolve) => {
-                    setTimeout(() => {
-                        if (!adbConnected) {
-                            enableLoop = false;
-                        }
-                        // 超时则认为adb没有连接成功
-                        resolve(false);
-                    }, timeout * 1000);
-                })
-            ]);
-            return res;
+  }
+
+  /** 推送指定文件 */
+  async push(sourcePath, targetPath) {
+    // 1. adb push应用的rpk
+    const pushCmd = `adb -s ${this.sn} push "${sourcePath}" ${targetPath}`;
+    this.logger(`Excuting: ${pushCmd}`);
+    const res = await adbMiwt.execAdbCmdAsync(pushCmd);
+    this.logger(`Push result: ${res}`);
+    return targetPath;
+  }
+  async unzip(zipPath, targetPath) {
+    const unzipCmd = `adb -s ${this.sn} shell unzip -o ${zipPath} -d ${targetPath}`;
+    this.logger(`Excuting: ${unzipCmd}`);
+    const res = await adbMiwt.execAdbCmdAsync(unzipCmd);
+    this.logger(`Unzip result: ${res}`);
+  }
+
+  /** 推送指定 rpk */
+  async pushRpk(rpkPath, appPackageName) {
+    // 1. adb push应用的rpk
+    const targetPath = `${this.appDir}/${appPackageName}.rpk`;
+    const pushCmd = `adb -s ${this.sn} push "${rpkPath}" ${targetPath}`;
+    this.logger(`Excuting: ${pushCmd}`);
+    const res = await adbMiwt.execAdbCmdAsync(pushCmd);
+    this.logger(`Push ${this.vvdName} rpk result: ${res}`);
+    return targetPath;
+  }
+
+  /**
+   * 判断模拟器是否 ready
+   */
+  async isConnected() {
+    return (0, _utils.tryRun)(async () => {
+      const devices = await adbMiwt.getAdbDevices();
+      _ColorConsole.default.log(`adb devices: ${JSON.stringify(devices)}`);
+      const curDev = devices.find(t => t.sn === this.sn);
+      return curDev?.status === 'device';
+    }, 10, 500);
+  }
+
+  /** 安装应用，留给子类实现 */
+  async install(rpkPath, packageName) {}
+
+  /** 卸载应用，留给子类实现 */
+  async uninstall(packageName) {}
+
+  /** 启动应用，留给子类实现 */
+  async startApp(packageName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  }
+  async pushAndInstall(rpkPath, appName) {
+    const targetPath = await this.pushRpk(rpkPath, appName);
+    await this.install(targetPath, appName);
+  }
+
+  /** 重启应用 */
+  async reloadApp(appName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  }
+
+  /** 关闭应用 */
+  async closeApp(appName) {}
+
+  /** 关闭模拟器 */
+  poweroff() {
+    let timeout = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 10 * 1000;
+    return new Promise((resolve, reject) => {
+      const t = setTimeout(() => {
+        (0, _utils.killProcessByCmd)(this.vvdName).then(resolve).catch(e => {
+          reject(`poweroff ${this.vvdName} failed ${e}`);
         });
-    }
-    /** 杀死进程 */
-    killProcess(currProcess) {
-        if (currProcess && currProcess.pid && currProcess.exitCode === null) {
-            console.log('process pid:', currProcess.pid);
-            try {
-                if (os_1.default.platform() === 'win32') {
-                    (0, child_process_1.execSync)(`taskkill /pid ${currProcess.pid} /T /F`);
-                }
-                else if (os_1.default.platform() === 'darwin') {
-                    process.kill(currProcess.pid);
-                }
-                else {
-                    currProcess.kill();
-                }
-            }
-            catch (err) {
-                ColorConsole_1.default.log(`### Emulator ### kill process get error :\n${err.stack}`);
-            }
-        }
-    }
-    /** 停止模拟器并释放相关资源 */
-    stop() {
-        return __awaiter(this, void 0, void 0, function* () {
-            adbMiwt.execAdbCmdSync(`adb -s ${this.sn} shell poweroff`);
-        });
-    }
-    /** 重启模拟器 */
-    restart() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.stop();
-            this.start(this.startOptions);
-        });
-    }
-    /** 创建server */
-    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}`);
-                });
-                socket.on('message', (data) => {
-                    const message = JSON.parse(data.toString());
-                    ColorConsole_1.default.log(`### App Socket server ### Websocket server get data: ${data}`);
-                    if (message.type === 'restart') {
-                        this.restart();
-                    }
-                    else if (message.type === 'stop') {
-                        this.stop();
-                    }
-                });
-            });
-        });
-    }
-    connectDevice() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const adbConnectCmd = `adb connect ${this.sn}`;
-            ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
-            let pending = true;
-            const p1 = adbMiwt.execAdbCmdAsync(adbConnectCmd);
-            let timer;
-            // 超过一定时间还没有连接成功，则 kill-server 后再试
-            // 用于处理 adb connect 一直 pending 的情况
-            const p2 = new Promise((resolve) => {
-                timer = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                    if (pending) {
-                        const adbKillCmd = `adb kill-server`;
-                        ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
-                        yield adbMiwt.execAdbCmdAsync(adbKillCmd);
-                    }
-                    resolve();
-                }), 10 * 1000);
-            });
-            p1.then((r) => {
-                pending = false;
-                clearTimeout(timer);
-                console.log(r);
-            });
-            return Promise.race([p1, p2]);
+      }, timeout);
+      adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell poweroff`).then(() => {
+        clearTimeout(t);
+        resolve();
+      }).catch(() => {
+        (0, _utils.killProcessByCmd)(this.vvdName).then(() => {
+          clearTimeout(t);
+          resolve();
+        }).catch(e => {
+          reject(`poweroff ${this.vvdName} failed ${e}`);
         });
+      });
+    });
+  }
+  systemed() {
+    return adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell systemd &`);
+  }
+
+  /** 重启模拟器 */
+  async reboot() {
+    const rebootCmd = `adb -s ${this.sn} shell reboot`;
+    _ColorConsole.default.log(`Excuting: ${rebootCmd}`);
+    await adbMiwt.execAdbCmdAsync(rebootCmd);
+    await this.isConnected();
+    if (!this.logcatProcess.exitCode !== undefined) {
+      // 如果 logcat 进程被杀死，则重新创建
+      const r = (0, _logcat.creatLogcat)(this.sn, this.onStdout, this.onErrout);
+      this.logcatProcess = r.logcatProcess;
+      this.stdoutReadline = r.stdoutReadline;
+      this.stderrReadline = r.stderrReadline;
+      this.disposeReadlines = r.dispose;
     }
+  }
 }
-exports.default = CommonInstance;
+var _default = exports.default = CommonEmulatorInstance;

package/lib/instance/dev.d.ts

@@ -1,51 +1,16 @@
-import readline from 'readline';
-import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
-import CommonInstance from './common';
-declare class GoldfishInstance extends CommonInstance {
+import CommonEmulatorInstance from './common';
+import { VelaImageType } from '../typing/Vvd';
+declare class GoldfishInstance extends CommonEmulatorInstance {
+    imageType: VelaImageType;
     appDir: string;
     emulatorStartedFlag: string;
-    stdoutReadline: readline.Interface;
-    stderrReadline: readline.Interface;
-    constructor(params: INewGoldfishInstanceParams);
-    /**
-     * 1. 启动模拟器
-     * 2. 启动成功后，adb连接模拟器
-     * 3. 连接成功后，在模拟器中启动快应用
-     */
-    start(options: IStartOptions): Promise<void>;
+    install(rpkPath: string, appPackageName?: string): Promise<void>;
     /**
      * 在模拟器中启动快应用
      * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
      * @param options
      */
-    startupQuickApp(options: IStartOptions): Promise<void>;
-    /**
-     * 启动模拟器
-     * 1. 通过options生成模拟器的启动命令
-     * 2. 执行启动命令
-     * 3. 判断模拟器是否启动成功
-     *    3.1 若disableNSH=true，输出流中匹配到(NSH)，认为模拟器启动成功了
-     *    3.2 若disableNSH=false，认为2s过后模拟器启动成功了
-     * @param options
-     * @returns
-     */
-    startGoldfish(options: IStartOptions): Promise<void>;
-    /**
-     * 将目录通过adb push到模拟器中
-     */
-    pushAndInstall(rpkPath?: string): Promise<void>;
-    /** 通过命令行启动时，在watich模式下监听websocket消息，
-     * 在文件发生变动时，重新启动应用
-     */
-    restart(): Promise<void>;
-    /**
-     * 重新推送，然后重启应用
-     */
-    pushAndReloadApp(): Promise<void>;
-    /**
-     * 重启应用
-     */
-    reloadApp(): Promise<void>;
-    reboot(): Promise<boolean>;
+    startApp(packageName: string, debug?: boolean): Promise<void>;
+    reloadApp(appName: string, debug?: boolean): Promise<void>;
 }
 export default GoldfishInstance;