@aiot-toolkit/emulator 2.0.2-beta.13 → 2.0.2-beta.15

package/lib/avd/index.js

@@ -3,12 +3,12 @@ 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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const ini_1 = require("ini");
-const constants_1 = require("../static/constants");
+const constants_1 = require("../emulatorutil/constants");
 const Avd_1 = require("../typing/Avd");
 const EAvdParamsToIni = {
     arm: {
@@ -104,7 +104,7 @@ class VelaAvdCls {
             return avdInfo;
         }
         catch (err) {
-            shared_utils_1.ColorConsole.log(`getVelaAvdInfo: ${err.message}`);
+            ColorConsole_1.default.log(`getVelaAvdInfo: ${err.message}`);
             return avdInfo;
         }
     }

package/lib/emulatorutil/EmulatorCmd.d.ts

@@ -0,0 +1,9 @@
+import { IStartOptions } from '../typing/Instance';
+declare class EmulatorCmd {
+    static startOptions: IStartOptions | undefined;
+    static createMiwerCmd(options: IStartOptions, sdkHome: string, avdHome: string): string | undefined;
+    static createDevCmd(options: IStartOptions, sdkHome: string, avdHome: string): string | undefined;
+    static createPreCmd(options: IStartOptions, sdkHome: string, avdHome: string): string[] | undefined;
+    static getEmulatorBinPath(sdkHome: string): string;
+}
+export default EmulatorCmd;

package/lib/emulatorutil/EmulatorCmd.js

@@ -0,0 +1,226 @@
+"use strict";
+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 fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const avd_1 = __importDefault(require("../avd"));
+const utils_1 = require("../utils");
+const os_1 = __importDefault(require("os"));
+const dayjs_1 = __importDefault(require("dayjs"));
+const constants_1 = require("./constants");
+class EmulatorCmd {
+    static createMiwerCmd(options, sdkHome, avdHome) {
+        var _a;
+        this.startOptions = options;
+        const { avdName, devtool } = options;
+        // 获取emulator bin的绝对路径
+        const emulatorBin = this.getEmulatorBinPath(sdkHome);
+        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+        // 获取vela镜像的绝对路径
+        const velaAvdCls = new avd_1.default({
+            sdkHome: sdkHome,
+            avdHome: avdHome
+        });
+        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
+        const { avdArch, avdImagePath, customImagePath } = avdInfo;
+        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
+        if (!avdImagePath) {
+            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+            return undefined;
+        }
+        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
+        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
+        // 端口映射
+        let portMappingStr = ``;
+        if (devtool) {
+            portMappingStr += `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
+        }
+        // 设备挂载节点
+        const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.bin'); // 只读
+        const dataImageBin = path_1.default.resolve(avdImagePath, 'vela_data.bin'); // 可读可写
+        const coreBin = path_1.default.resolve(avdImagePath, 'coredump.core'); // 只读
+        // 复制可写文件到AVD目录下（多模拟器实例时需要）
+        const dataImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'vela_data.bin');
+        if (!fs_extra_1.default.existsSync(dataImageBinInAvd)) {
+            // vela_data.bin不存在时直接copy
+            fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+        }
+        else {
+            // vela_data.bin存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+            const statsInAvd = fs_extra_1.default.statSync(dataImageBinInAvd);
+            const stats = fs_extra_1.default.statSync(dataImageBin);
+            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
+                fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+            }
+        }
+        // 挂载节点配置，只读文件加入read-only标识
+        const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBin},read-only \
+-device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
+-drive index=1,id=userdata,if=none,format=raw,file=${dataImageBinInAvd} \
+-device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
+-drive index=2,id=vendor,if=none,format=raw,file=${coreBin},read-only \
+-device virtio-blk-device,bus=virtio-mmio-bus.4,drive=vendor \
+-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
+        // grpc配置
+        let windowStr = '';
+        let grpcStr = '';
+        if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.grpcPort) {
+            windowStr = '-qt-hide-window';
+            grpcStr = ` -idle-grpc-timeout 300 -grpc ${this.startOptions.grpcPort}`;
+        }
+        // 启动模拟器的命令和参数
+        const cmd = `${emulatorBin} -nuttx -avd ${avdName} -port ${options.adbPort} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} ${grpcStr} -qemu ${imageMountStr}`;
+        return cmd;
+    }
+    static createDevCmd(options, sdkHome, avdHome) {
+        var _a;
+        this.startOptions = options;
+        const { avdName, devtool } = options;
+        const emulatorBin = this.getEmulatorBinPath(sdkHome);
+        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+        const velaAvdCls = new avd_1.default({
+            sdkHome: sdkHome,
+            avdHome: avdHome
+        });
+        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
+        const { avdArch, avdImagePath, customImagePath } = avdInfo;
+        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
+        if (!avdImagePath) {
+            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+            return undefined;
+        }
+        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
+        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
+        // 端口映射
+        let portMappingStr = ``;
+        if (devtool) {
+            portMappingStr += `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
+        }
+        // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
+        const systemImageBin = path_1.default.join(avdImagePath, 'system.img');
+        const dataImageBin = path_1.default.join(avdImagePath, 'data.img');
+        // 复制可写文件到AVD目录下（多模拟器实例时需要）
+        const dataImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'data.img');
+        if (!fs_extra_1.default.existsSync(dataImageBinInAvd)) {
+            // data.img不存在时直接copy
+            fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+        }
+        else {
+            // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+            const statsInAvd = fs_extra_1.default.statSync(dataImageBinInAvd);
+            const stats = fs_extra_1.default.statSync(dataImageBin);
+            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
+                fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+            }
+        }
+        // 复制可写文件到AVD目录下（多模拟器实例时需要）
+        const systemImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'system.img');
+        if (!fs_extra_1.default.existsSync(systemImageBinInAvd)) {
+            // data.img不存在时直接copy
+            fs_extra_1.default.copyFileSync(systemImageBin, systemImageBinInAvd);
+        }
+        else {
+            // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+            const statsInAvd = fs_extra_1.default.statSync(systemImageBinInAvd);
+            const stats = fs_extra_1.default.statSync(systemImageBin);
+            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
+                fs_extra_1.default.copyFileSync(systemImageBin, systemImageBinInAvd);
+            }
+        }
+        // 复制可写文件到AVD目录下（多模拟器实例时需要）
+        // const nuttxBinInAvd = path.join(this.avdHome, `${avdName}.avd`, 'nuttx')
+        // if (!fs.existsSync(nuttxBinInAvd)) {
+        //   // data.img不存在时直接copy
+        //   fs.copyFileSync(nuttxBinPath, nuttxBinInAvd)
+        // } else {
+        //   // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+        //   const statsInAvd = fs.statSync(nuttxBinInAvd)
+        //   const stats = fs.statSync(nuttxBinPath)
+        //   if (dayjs(stats.mtime).isAfter(statsInAvd.mtime)) {
+        //     fs.copyFileSync(nuttxBinPath, nuttxBinInAvd)
+        //   }
+        // }
+        const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBinInAvd} \
+-device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
+-drive index=1,id=userdata,if=none,format=raw,file=${dataImageBinInAvd} \
+-device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
+-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
+        // grpc配置
+        let windowStr = '';
+        let grpcStr = '';
+        if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.grpcPort) {
+            windowStr = '-qt-hide-window';
+            grpcStr = ` -idle-grpc-timeout 300 -grpc ${this.startOptions.grpcPort}`;
+        }
+        // 启动模拟器的命令和参数
+        const cmd = `${emulatorBin} -nuttx -avd ${avdName} -port ${options.adbPort} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} ${grpcStr} -qemu ${imageMountStr}`;
+        return cmd;
+    }
+    static createPreCmd(options, sdkHome, avdHome) {
+        this.startOptions = options;
+        const { avdName, devtool } = options;
+        // 获取emulator bin的绝对路径
+        const emulatorBin = this.getEmulatorBinPath(sdkHome);
+        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+        // 获取vela镜像的绝对路径
+        const velaAvdCls = new avd_1.default({
+            sdkHome: sdkHome,
+            avdHome: avdHome
+        });
+        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
+        const { avdArch, avdImagePath, customImagePath } = avdInfo;
+        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
+        if (!avdImagePath) {
+            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+            return undefined;
+        }
+        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
+        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
+        // 端口映射，adb端口和debug端口
+        let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
+        if (devtool) {
+            ColorConsole_1.default.log(`### Emulator ### debug port: ${options.debugPort}`);
+            portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
+        }
+        ColorConsole_1.default.log(`### Emulator ### Start qemu with TCP: ${portMappingStr}`);
+        // vnc配置
+        let noWindow = false;
+        let vncStr = '';
+        if (options.grpcPort) {
+            noWindow = true;
+            const portSuffix = options.grpcPort - constants_1.defaultVncPort;
+            vncStr = `-vnc :${portSuffix}`;
+        }
+        // 启动goldfish的命令和参数
+        const spawnArgs = [
+            emulatorBin,
+            '-nuttx',
+            '-avd',
+            avdName,
+            '-avd-arch',
+            avdArch,
+            '-show-kernel',
+            '-kernel',
+            nuttxBinPath,
+            noWindow ? '-no-window' : '',
+            '-qemu',
+            vncStr,
+            '-netdev',
+            portMappingStr,
+            '-device',
+            'virtio-net-device,netdev=u1,bus=virtio-mmio-bus.3'
+        ];
+        return spawnArgs;
+    }
+    static getEmulatorBinPath(sdkHome) {
+        const osPlatform = os_1.default.platform();
+        const arch = (0, utils_1.getSystemArch)();
+        const platform = osPlatform === 'win32' ? 'windows' : osPlatform;
+        const emulatorHome = path_1.default.resolve(sdkHome, 'emulator');
+        return path_1.default.resolve(emulatorHome, `${platform}-${arch}`, 'emulator');
+    }
+}
+exports.default = EmulatorCmd;

package/lib/emulatorutil/EmulatorLog.d.ts

@@ -0,0 +1,11 @@
+declare class EmulatorLog {
+    static emulatorStartedFlag: RegExp;
+    static installFlag: RegExp;
+    static devStartFlag: string;
+    static preDevStartFlag: RegExp;
+    static inStallIsFinshe(msg: string): RegExpMatchArray | null;
+    static rpkIsStart(msg: string): RegExpMatchArray | null;
+    static devIsStart(msg: string): boolean;
+    static preDevIsStart(msg: string): RegExpMatchArray | null;
+}
+export default EmulatorLog;

package/lib/emulatorutil/EmulatorLog.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class EmulatorLog {
+    static inStallIsFinshe(msg) {
+        return msg.match(EmulatorLog.installFlag);
+    }
+    static rpkIsStart(msg) {
+        return msg.match(EmulatorLog.emulatorStartedFlag);
+    }
+    static devIsStart(msg) {
+        return msg.includes(EmulatorLog.devStartFlag);
+    }
+    static preDevIsStart(msg) {
+        return msg.match(EmulatorLog.preDevStartFlag);
+    }
+}
+EmulatorLog.emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
+EmulatorLog.installFlag = /InstallState_Finished|install finished/;
+EmulatorLog.devStartFlag = '(NSH)';
+EmulatorLog.preDevStartFlag = /Server started, listening on: 127.0.0.1:(\d+)/;
+exports.default = EmulatorLog;

package/lib/{static → emulatorutil}/constants.js

@@ -27,14 +27,14 @@ exports.VelaImageVersionList = [
     {
         label: 'vela-4.0-正式版',
         value: 'vela-release-4.0',
-        time: '2024-07-15T15:57:00',
+        time: '2024-08-12T06:48:00',
         hide: false,
         icon: null
     },
     {
         label: 'vela-4.0-测试版',
         value: 'vela-pre-4.0',
-        time: '2024-07-15T07:07:00',
+        time: '2024-08-12T06:48:00',
         hide: false,
         icon: null
     },

package/lib/emulatorutil/index.d.ts

@@ -0,0 +1,3 @@
+import EmulatorLog from './EmulatorLog';
+import EmulatorCmd from './EmulatorCmd';
+export { EmulatorLog, EmulatorCmd };

package/lib/emulatorutil/index.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmulatorCmd = exports.EmulatorLog = void 0;
+const EmulatorLog_1 = __importDefault(require("./EmulatorLog"));
+exports.EmulatorLog = EmulatorLog_1.default;
+const EmulatorCmd_1 = __importDefault(require("./EmulatorCmd"));
+exports.EmulatorCmd = EmulatorCmd_1.default;

package/lib/index.d.ts

@@ -3,5 +3,5 @@ import { getSystemArch } from './utils';
 export * from './instance';
 export * from './typing/Avd';
 export * from './typing/Instance';
-export * from './static/constants';
+export * from './emulatorutil/constants';
 export { VelaAvdCls, getSystemArch };

package/lib/index.js

@@ -25,4 +25,4 @@ Object.defineProperty(exports, "getSystemArch", { enumerable: true, get: functio
 __exportStar(require("./instance"), exports);
 __exportStar(require("./typing/Avd"), exports);
 __exportStar(require("./typing/Instance"), exports);
-__exportStar(require("./static/constants"), exports);
+__exportStar(require("./emulatorutil/constants"), exports);

package/lib/instance/common.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const UxFileUtils_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/utils/ux/UxFileUtils"));
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+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"));
@@ -44,14 +44,14 @@ 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("../static/constants");
+const constants_1 = require("../emulatorutil/constants");
 const utils_1 = require("../utils");
 /**
  * CommonInstance
  */
 class CommonInstance {
     constructor(params) {
-        this.quickappStartedFlag = /__loadChunks/;
+        this.quickappStartedFlag = /Start App loop/;
         this.isFirstStart = true;
         this.isDistributedApp = false;
         this.projectPath = params.projectPath;
@@ -80,7 +80,9 @@ class CommonInstance {
     }
     /** 在goldfish模拟器中运行快应用 */
     start(options) {
-        return __awaiter(this, void 0, void 0, function* () { });
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error(`start method not implemented, ${options}`);
+        });
     }
     /**
      * 判断模拟器是否 ready
@@ -89,7 +91,7 @@ class CommonInstance {
         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();
-                shared_utils_1.ColorConsole.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
+                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);
@@ -109,14 +111,14 @@ class CommonInstance {
                 while (enableLoop && !adbConnected) {
                     if (needKill) {
                         const adbKillCmd = `adb kill-server`;
-                        shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
+                        ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
                         yield adbMiwt.execAdbCmdAsync(adbKillCmd);
                     }
                     const str = yield this.connectDevice();
-                    shared_utils_1.ColorConsole.log(`### Emulator ### ${str}`);
+                    ColorConsole_1.default.log(`### Emulator ### ${str}`);
                     // 查询模拟器的状态是否为“device”
                     const devices = yield adbMiwt.getAdbDevices();
-                    shared_utils_1.ColorConsole.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
+                    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;
@@ -155,7 +157,7 @@ class CommonInstance {
                 }
             }
             catch (err) {
-                shared_utils_1.ColorConsole.log(`### Emulator ### kill process get error :\n${err.stack}`);
+                ColorConsole_1.default.log(`### Emulator ### kill process get error :\n${err.stack}`);
             }
         }
     }
@@ -193,13 +195,13 @@ class CommonInstance {
                 port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort
             });
             wsServer.on('connection', (socket) => {
-                shared_utils_1.ColorConsole.success(`### App Socket server ### Websocket connects to websocket server`);
+                ColorConsole_1.default.success(`### App Socket server ### Websocket connects to websocket server`);
                 socket.on('error', (err) => {
-                    shared_utils_1.ColorConsole.error(`### App Socket server ### Websocket server error: ${err.message}`);
+                    ColorConsole_1.default.error(`### App Socket server ### Websocket server error: ${err.message}`);
                 });
                 socket.on('message', (data) => {
                     const message = JSON.parse(data.toString());
-                    shared_utils_1.ColorConsole.log(`### App Socket server ### Websocket server get data: ${data}`);
+                    ColorConsole_1.default.log(`### App Socket server ### Websocket server get data: ${data}`);
                     if (message.type === 'restart') {
                         this.restart();
                     }
@@ -213,17 +215,17 @@ class CommonInstance {
     connectDevice() {
         return __awaiter(this, void 0, void 0, function* () {
             const adbConnectCmd = `adb connect ${this.sn}`;
-            shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
+            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, reject) => {
+            const p2 = new Promise((resolve) => {
                 timer = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                     if (pending) {
                         const adbKillCmd = `adb kill-server`;
-                        shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
+                        ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
                         yield adbMiwt.execAdbCmdAsync(adbKillCmd);
                     }
                     resolve();

package/lib/instance/dev.d.ts

@@ -1,8 +1,12 @@
+/// <reference types="node" />
+import readline from 'readline';
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
 import CommonInstance from './common';
 declare class GoldfishInstance extends CommonInstance {
-    appRunDir: string;
+    appDir: string;
     emulatorStartedFlag: string;
+    stdoutReadline: readline.Interface;
+    stderrReadline: readline.Interface;
     constructor(params: INewGoldfishInstanceParams);
     /**
      * 1. 启动模拟器
@@ -29,9 +33,12 @@ declare class GoldfishInstance extends CommonInstance {
     startGoldfish(options: IStartOptions): Promise<void>;
     /**
      * 将目录通过adb push到模拟器中
-     * @param sourceRoot
      */
-    pushRpk(sourceRoot: string): Promise<void>;
+    pushAndInstall(rpkPath?: string): Promise<void>;
+    /** 通过命令行启动时，在watich模式下监听websocket消息，
+     * 在文件发生变动时，重新启动应用
+     */
+    restart(): Promise<void>;
     /**
      * 重新推送，然后重启应用
      */