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

package/lib/instance/miwear.js

@@ -35,16 +35,18 @@ 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 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 dayjs_1 = __importDefault(require("dayjs"));
 const MAX_RECONNECT_COUNT = 8;
 /**
  * MiwearInstance
@@ -54,11 +56,8 @@ class MiwearInstance extends common_1.default {
     constructor(params) {
         super(params);
         this.params = params;
-        this.quickappStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
-        this.appPathInEmulator = '/data/quickapp/app';
+        this.appDir = '/data/quickapp/app';
         this.reconnectCount = 0;
-        this.emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
-        this.installBol = false;
     }
     /**
      * 1. 启动模拟器
@@ -74,7 +73,7 @@ class MiwearInstance extends common_1.default {
             // adb连接模拟器
             const connected = yield this.isConnected();
             if (connected) {
-                shared_utils_1.ColorConsole.info('### Emulator ### Goldfish emulator connected successfully');
+                ColorConsole_1.default.info('### Emulator ### Goldfish emulator connected successfully');
                 // 如果是首次启动，创建server端监听事件
                 if (this.isFirstStart && this.startOptions.serverPort) {
                     yield this.createWebsockeServer();
@@ -85,7 +84,7 @@ class MiwearInstance extends common_1.default {
             }
             else {
                 const msg = '### Emulator ### Failed to connect emulator, please check whether the adb is normal';
-                shared_utils_1.ColorConsole.throw(msg);
+                ColorConsole_1.default.throw(msg);
                 throw new Error(msg);
             }
         });
@@ -101,120 +100,58 @@ class MiwearInstance extends common_1.default {
      * @returns
      */
     startGoldfish(options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { avdName, devtool, origin = 'terminal' } = options;
-            // 获取emulator bin的绝对路径
-            const emulatorBin = this.getEmulatorBinPath();
-            shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
-            // 获取vela镜像的绝对路径
-            const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath, customImagePath } = avdInfo;
-            shared_utils_1.ColorConsole.log(`### Emulator ### adb port: ${options.adbPort}`);
-            if (!avdImagePath) {
-                return shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
-            }
-            const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
-            shared_utils_1.ColorConsole.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(this.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 { origin = Instance_1.IStartOrigin.Terminal } = options;
             // 启动模拟器的命令和参数
-            const cmd = `${emulatorBin} -nuttx -avd ${avdName} -port ${options.adbPort} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} ${grpcStr} -qemu ${imageMountStr}`;
+            const cmd = emulatorutil_1.EmulatorCmd.createMiwerCmd(options, this.sdkHome, this.avdHome);
+            if (!cmd)
+                return;
             const spawnArgs = cmd.split(' ');
             const spawnBin = spawnArgs.shift();
-            shared_utils_1.ColorConsole.log(`### Emulator ### Start CMD: ${cmd}`);
+            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, _c;
+                var _a, _b;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, {
                     stdio: 'pipe',
                     shell: true,
                     cwd: this.sdkHome
                 });
-                // 处理origin为terminal
-                if (origin === 'terminal') {
-                    process.stdout.pipe(this.goldfishProcess.stdin);
-                    //setTimeout是为了解决window环境报错
-                    const stdoutPipe = () => {
-                        var _a, _b, _c, _d;
-                        (_b = (_a = this.goldfishProcess) === null || _a === void 0 ? void 0 : _a.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
-                        (_d = (_c = this.goldfishProcess) === null || _c === void 0 ? void 0 : _c.stderr) === null || _d === void 0 ? void 0 : _d.pipe(process.stderr);
-                    };
-                    if (this.goldfishProcess.connected) {
-                        stdoutPipe();
-                    }
-                    else {
-                        setTimeout(stdoutPipe, 0);
-                    }
-                    //setTimeout加一层保险防止app无法拉起
-                    setTimeout(() => {
-                        this.pmInstallApp && this.pmInstallApp(10);
-                    }, 10000);
+                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) => {
-                    shared_utils_1.ColorConsole.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
                     if (options.exitCallback) {
                         options.exitCallback(code);
                     }
                 });
                 // 监听错误流
-                (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+                (_a = this.stderrReadline) === null || _a === void 0 ? void 0 : _a.on('line', (data) => {
                     const stderrCb = options.stderrCallback || console.log;
                     stderrCb(data.toString());
                 });
                 // 监听输出流
-                (_c = (_b = this.goldfishProcess) === null || _b === void 0 ? void 0 : _b.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (data) => {
+                (_b = this.stdoutReadline) === null || _b === void 0 ? void 0 : _b.on('line', (data) => {
                     const msg = data.toString();
-                    if (origin === 'ide') {
-                        const stdoutCb = options.stdoutCallback || console.log;
-                        stdoutCb(msg);
-                    }
+                    const stdoutCb = options.stdoutCallback || console.log;
+                    stdoutCb(msg);
                     // 应用安装成功，则启动它
-                    if (msg.match(/InstallState_Finished|install finished/)) {
-                        if (origin === 'terminal')
-                            this.installBol = true;
-                        shared_utils_1.ColorConsole.info(`### Emulator ### Install quickapp successfully`);
+                    if (emulatorutil_1.EmulatorLog.inStallIsFinshe(msg)) {
+                        ColorConsole_1.default.info(`### Emulator ### Install quickapp successfully`);
                         this.launchQuickapp();
                     }
                     // 匹配到，则认为模拟器启动成功
-                    if (msg.match(this.emulatorStartedFlag)) {
-                        shared_utils_1.ColorConsole.info(`### Emulator ### Goldfish emulator starts successfully`);
+                    if (func(msg)) {
+                        ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
                         resolve();
                     }
                 });
@@ -241,7 +178,7 @@ class MiwearInstance extends common_1.default {
                 .readdirSync(releaseDir)
                 .filter((item) => item.includes(appPackageName) && item.endsWith('.rpk'));
             if (files.length === 0) {
-                shared_utils_1.ColorConsole.error(`### Emulator the rpk does not exist`);
+                ColorConsole_1.default.error(`### Emulator the rpk does not exist`);
             }
             const rpkPath = path_1.default.resolve(releaseDir, files[0]);
             // 调试模式需要push一个文件至miwear中
@@ -252,7 +189,7 @@ class MiwearInstance extends common_1.default {
             else {
                 yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell rm /data/debugger_ip.cfg`);
             }
-            this.installRpkToAppList(rpkPath, this.appPathInEmulator);
+            this.pushAndInstall(rpkPath, this.appDir);
         });
     }
     /**
@@ -262,16 +199,16 @@ class MiwearInstance extends common_1.default {
      * @param rpkPath rpk的绝对目录
      * @param targetDir 要将rpk放到模拟器的哪个目录下
      */
-    installRpkToAppList(rpkPath, targetDir) {
+    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}`;
-            shared_utils_1.ColorConsole.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
+            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
             yield adbMiwt.execAdbCmdAsync(pushCmd);
             const installCmd = `adb -s ${this.sn} shell pm install ${targetPath}`;
-            shared_utils_1.ColorConsole.info(`### Emulator ### Excuting cmd: ${installCmd}`);
+            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
             yield adbMiwt.execAdbCmdAsync(installCmd);
         });
     }
@@ -280,37 +217,10 @@ class MiwearInstance extends common_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const { package: packageName } = this.projectInfo;
             const startCmd = `adb -s ${this.sn} shell am start ${packageName}`;
-            shared_utils_1.ColorConsole.info(`### Emulator ### Excuting cmd: ${startCmd}`);
+            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${startCmd}`);
             adbMiwt.execAdbCmdAsync(startCmd);
         });
     }
-    /** 命令行模式下添加重复调用防止app无法拉起
-     * 主要用将子进程的流输出到主进程后，由于流写入的过多可能会影响事件循环
-     */
-    pmInstallApp(maxRepeats, count = 0) {
-        var _a;
-        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 { package: packageName } = this.projectInfo;
-        const files = fs_extra_1.default
-            .readdirSync(releaseDir)
-            .filter((item) => item.includes(packageName) && item.endsWith('.rpk'));
-        const targetDir = path_1.default.resolve(releaseDir, files[0]);
-        const targetPath = `${targetDir}/${packageName}.rpk`;
-        const installCmd = `adb -s ${this.sn} shell pm install  ${targetPath}`;
-        if (count < maxRepeats - 1 && !this.installBol) {
-            count++;
-            shared_utils_1.ColorConsole.info(`### Emulator ### Excuting cmd: terminalr ${installCmd}`);
-            adbMiwt.execAdbCmdAsync(installCmd);
-            setTimeout(() => {
-                this.pmInstallApp(maxRepeats, count);
-            }, 6000);
-        }
-        else {
-            return;
-        }
-    }
     /** 连接模拟器中的调试服务，创建debugSocket
      * 主要用于热更新时，通过debugSocket通知调试服务更新页面
      * 设置了重连机制，会重复连接8次
@@ -323,7 +233,7 @@ class MiwearInstance extends common_1.default {
             }
             this.debugSocket = new ws_1.default(`ws://localhost:${(_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.debugPort}`);
             this.debugSocket.onopen = () => {
-                shared_utils_1.ColorConsole.info(`### Emulator debugSocket connect success`);
+                ColorConsole_1.default.info(`### Emulator debugSocket connect success`);
                 return resolve();
             };
             this.debugSocket.onerror = (errorEvent) => {
@@ -331,7 +241,7 @@ class MiwearInstance extends common_1.default {
                 // 重连机制
                 (_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.terminate();
                 if (this.reconnectCount < MAX_RECONNECT_COUNT) {
-                    shared_utils_1.ColorConsole.info(`### Emulator the ${this.reconnectCount + 1}th time to reconnect debug server`);
+                    ColorConsole_1.default.info(`### Emulator the ${this.reconnectCount + 1}th time to reconnect debug server`);
                     this.reconnectCount++;
                     setTimeout(() => this.initDebugSocket(), 2000);
                 }
@@ -344,7 +254,7 @@ class MiwearInstance extends common_1.default {
             this.debugSocket.onclose = (closeEvent) => {
                 this.debugSocket = undefined;
                 this.reconnectCount = 0;
-                shared_utils_1.ColorConsole.log(`### Emulator debugSocket connect close: ${closeEvent.reason}`);
+                ColorConsole_1.default.log(`### Emulator debugSocket connect close: ${closeEvent.reason}`);
             };
         });
     }
@@ -367,7 +277,7 @@ class MiwearInstance extends common_1.default {
                 }
             }
             catch (e) {
-                shared_utils_1.ColorConsole.error(`${e}`);
+                ColorConsole_1.default.error(`${e}`);
             }
         });
     }
@@ -378,17 +288,25 @@ class MiwearInstance extends common_1.default {
             // windows平台adb push时无法使用通配符，需另外处理;
             // 项目路径包含空格时，无法通过加引号来使用 * 通配符
             if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
-                const rmCmd = `adb -s ${this.sn} shell rm -r ${this.appPathInEmulator}/${appPackageName}`;
+                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.appPathInEmulator}/${appPackageName}`;
+                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.appPathInEmulator}/${appPackageName}`);
+                yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} push ${sourcePath} ${this.appDir}/${appPackageName}`);
             }
-            shared_utils_1.ColorConsole.info(`### Emulator push to ${this.appPathInEmulator}/${appPackageName} successfully`);
+            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功能）
@@ -410,15 +328,15 @@ class MiwearInstance extends common_1.default {
                 // 2. 执行am stop和am start命令
                 const stopCmd = `adb -s ${this.sn} shell am stop ${appPackageName}`;
                 yield adbMiwt.execAdbCmdAsync(stopCmd);
-                shared_utils_1.ColorConsole.info(`### Emulator stop ${appPackageName} successfully`);
+                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);
-                shared_utils_1.ColorConsole.info(`### Emulator start ${appPackageName} successfully`);
+                ColorConsole_1.default.info(`### Emulator start ${appPackageName} successfully`);
             }
             catch (e) {
-                shared_utils_1.ColorConsole.error(`${e}`);
+                ColorConsole_1.default.error(`${e}`);
             }
         });
     }
@@ -432,15 +350,15 @@ class MiwearInstance extends common_1.default {
                 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}`);
                 });
                 // data的格式：{ type: string, data: any }
                 socket.on('message', (data) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     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') {
                         // 非调试模式下无法热更新
                         if (!((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.devtool)) {

package/lib/instance/pre.d.ts

@@ -3,6 +3,9 @@ import GoldfishInstance from './dev';
  * 不带 miwear 的 4.0 镜像
  */
 declare class PreInstance extends GoldfishInstance {
-    appRunDir: string;
+    appDir: string;
+    pushRpk(rpkPath?: string): Promise<string>;
+    installApp(rpkPath?: string): Promise<void>;
+    pushAndInstall(rpkPath?: string): Promise<void>;
 }
 export default PreInstance;

package/lib/instance/pre.js

@@ -1,17 +1,98 @@
 "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;
+});
+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 path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
 const dev_1 = __importDefault(require("./dev"));
 const miwear_1 = __importDefault(require("./miwear"));
+const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const adbMiwt = __importStar(require("@miwt/adb"));
 /**
  * 不带 miwear 的 4.0 镜像
  */
 class PreInstance extends dev_1.default {
     constructor() {
         super(...arguments);
-        this.appRunDir = '/data/quickapp/app';
+        this.appDir = '/data/quickapp/app';
+    }
+    pushRpk(rpkPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { package: appPackageName } = this.projectInfo;
+            const releaseDir = this.isRpk
+                ? path_1.default.resolve(this.projectPath, '../')
+                : path_1.default.resolve(this.projectPath, 'dist');
+            let srouceRpk = rpkPath;
+            if (!srouceRpk) {
+                const files = fs_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`);
+                }
+                srouceRpk = path_1.default.resolve(releaseDir, files[0]);
+            }
+            // 1. adb push应用的rpk
+            const targetPath = `${this.appDir}/${appPackageName}.rpk`;
+            const pushCmd = `adb -s ${this.sn} push "${srouceRpk}" ${targetPath}`;
+            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
+            yield adbMiwt.execAdbCmdAsync(pushCmd);
+            ColorConsole_1.default.info(`### Emulator push to ${this.appDir}/${appPackageName} successfully`);
+            return targetPath;
+        });
+    }
+    installApp(rpkPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { package: appPackageName } = this.projectInfo;
+            // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
+            rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;
+            const targetPath = `${this.appDir}/${appPackageName}`;
+            const mkdirCmd = `adb -s ${this.sn} shell mkdir ${targetPath}`;
+            ColorConsole_1.default.info(`### Emulator mkdir cmd ${mkdirCmd}`);
+            yield adbMiwt.execAdbCmdAsync(mkdirCmd);
+            const unzipCmd = `adb -s ${this.sn} shell unzip -o ${rpkPath} -d ${targetPath}`;
+            ColorConsole_1.default.info(`### Emulator unzip cmd ${unzipCmd}`);
+            yield adbMiwt.execAdbCmdAsync(unzipCmd);
+        });
+    }
+    pushAndInstall(rpkPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const target = yield this.pushRpk(rpkPath);
+            yield this.installApp(target);
+        });
     }
 }
 //  pre 镜像的 启动 方式与 MiwearInstance 一致

package/lib/instance/preDev.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ChildProcess } from 'child_process';
+import readline from 'readline';
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
 import CommonInstance from './common';
 /**
@@ -9,6 +11,8 @@ import CommonInstance from './common';
 declare class OldGoldfishInstance extends CommonInstance {
     private host9pPort;
     v9fsProcess: ChildProcess | undefined;
+    stdoutReadline: readline.Interface;
+    stderrReadline: readline.Interface;
     constructor(params: INewGoldfishInstanceParams);
     /**
      * 1. 启动9p server