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

package/lib/instance/dev.js

@@ -35,18 +35,19 @@ 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 dayjs_1 = __importDefault(require("dayjs"));
-const fs_1 = __importDefault(require("fs"));
+const readline_1 = __importDefault(require("readline"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const Instance_1 = require("../typing/Instance");
 const common_1 = __importDefault(require("./common"));
+const emulatorutil_1 = require("../emulatorutil");
 class GoldfishInstance extends common_1.default {
     constructor(params) {
         super(params);
-        this.appRunDir = '/data/app';
+        this.appDir = '/data/app';
         this.emulatorStartedFlag = '(NSH)';
     }
     /**
@@ -62,26 +63,18 @@ class GoldfishInstance extends common_1.default {
             yield this.startGoldfish(options);
             const connected = yield this.isConnected();
             if (connected) {
-                shared_utils_1.ColorConsole.log('### Emulator ### Goldfish emulator connected successfully');
+                ColorConsole_1.default.log('### Emulator ### Goldfish emulator connected successfully');
                 if (this.isFirstStart && this.startOptions.serverPort) {
                     yield this.createWebsockeServer();
                 }
-                // adb push快应用到模拟器的/data/app目录
-                // aspect应用后续要考虑各种形状表盘的推包
-                const buildedFilesPath = this.isRpk
-                    ? this.projectPath
-                    : this.isDistributedApp
-                        ? options.dist ||
-                            path_1.default.join(this.projectPath, './build', `${this.projectInfo.package}.watch`)
-                        : path_1.default.join(this.projectPath, './build');
-                yield this.pushRpk(buildedFilesPath);
+                yield this.pushAndInstall();
                 // 在模拟器中启动快应用
                 this.startupQuickApp(options);
                 this.isFirstStart = false;
             }
             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);
             }
         });
@@ -99,12 +92,12 @@ class GoldfishInstance extends common_1.default {
                 if (options.devtool) {
                     vappCmd = `adb -s ${this.sn} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
                 }
-                shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
+                ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
                 // vapp进程会一直pending，不会退出。这里必须加stdio: 'ignore'，否则快应用无法运行成功
                 adbMiwt.execAdbCmdAsync(vappCmd, { stdio: 'ignore', encoding: 'utf-8' });
             }
             catch (e) {
-                shared_utils_1.ColorConsole.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
+                ColorConsole_1.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
             }
         });
     }
@@ -119,110 +112,44 @@ class GoldfishInstance extends common_1.default {
      * @returns
      */
     startGoldfish(options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { avdName, devtool, origin = 'terminal' } = options;
-            const emulatorBin = this.getEmulatorBinPath();
-            shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
-            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`;
-            }
-            // 文件系统配置，第一次使用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(this.avdHome, `${avdName}.avd`, 'data.img');
-            if (!fs_1.default.existsSync(dataImageBinInAvd)) {
-                // data.img不存在时直接copy
-                fs_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
-            }
-            else {
-                // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
-                const statsInAvd = fs_1.default.statSync(dataImageBinInAvd);
-                const stats = fs_1.default.statSync(dataImageBin);
-                if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
-                    fs_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
-                }
-            }
-            // 复制可写文件到AVD目录下（多模拟器实例时需要）
-            const systemImageBinInAvd = path_1.default.join(this.avdHome, `${avdName}.avd`, 'system.img');
-            if (!fs_1.default.existsSync(systemImageBinInAvd)) {
-                // data.img不存在时直接copy
-                fs_1.default.copyFileSync(systemImageBin, systemImageBinInAvd);
-            }
-            else {
-                // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
-                const statsInAvd = fs_1.default.statSync(systemImageBinInAvd);
-                const stats = fs_1.default.statSync(systemImageBin);
-                if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
-                    fs_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 { 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.createDevCmd(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 dev: ${cmd}`);
             return new Promise((resolve) => {
-                var _a, _b, _c;
+                var _a, _b;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: 'pipe', shell: true });
-                (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+                // 利用 readline 接口可解决子进程日志换行的问题
+                this.stdoutReadline = readline_1.default.createInterface({
+                    input: this.goldfishProcess.stdout
+                });
+                this.stderrReadline = readline_1.default.createInterface({
+                    input: this.goldfishProcess.stderr
+                });
+                (_a = this.stderrReadline) === null || _a === void 0 ? void 0 : _a.on('line', (data) => {
                     const stderrCb = options.stderrCallback || console.log;
                     stderrCb(data.toString());
                 });
-                if (origin === 'terminal') {
-                    process.stdout.pipe(this.goldfishProcess.stdin);
-                    (_b = this.goldfishProcess.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
+                if (origin === Instance_1.IStartOrigin.Terminal) {
+                    process.stdin.pipe(this.goldfishProcess.stdin);
                 }
                 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);
                     }
                 });
-                (_c = this.goldfishProcess.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);
-                    }
-                    if (msg.includes(this.emulatorStartedFlag)) {
-                        shared_utils_1.ColorConsole.log(`### Emulator ### Goldfish emulator starts successfully`);
+                    const stdoutCb = options.stdoutCallback || console.log;
+                    stdoutCb(msg);
+                    if (emulatorutil_1.EmulatorLog.devIsStart(msg)) {
+                        ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
                         resolve();
                     }
                 });
@@ -231,54 +158,61 @@ class GoldfishInstance extends common_1.default {
     }
     /**
      * 将目录通过adb push到模拟器中
-     * @param sourceRoot
      */
-    pushRpk(sourceRoot) {
+    pushAndInstall(rpkPath) {
         return __awaiter(this, void 0, void 0, function* () {
             const sn = this.sn;
             const { package: appPackageName } = this.projectInfo;
+            const sourceRoot = rpkPath || this.isRpk ? this.projectPath : path_1.default.join(this.projectPath, './build');
             // 获取最后一层目录，比如build
             const basename = path_1.default.basename(sourceRoot);
             if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
                 // windows系统或者项目路径有空格：1. adb push目录；2. 在模拟器中使用mv命令重命名
                 // 注意 sourceRoot 中可能会有空格
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push "${sourceRoot}" ${this.appRunDir}`);
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} shell  mv ${this.appRunDir}/${basename} ${this.appRunDir}/${appPackageName}`);
+                const pushCmd = `adb -s ${sn} push "${sourceRoot}" ${this.appDir}`;
+                ColorConsole_1.default.info(`### Emulator ### push CMD: ${pushCmd}`);
+                yield adbMiwt.execAdbCmdAsync(pushCmd);
+                // 在 windows 上 mv 命令不能更新原有的文件,需要先删除
+                const rmCmd = `adb -s ${sn} shell rm -r ${this.appDir}/${appPackageName}`;
+                ColorConsole_1.default.info(`### Emulator ### mv CMD: ${rmCmd}`);
+                yield adbMiwt.execAdbCmdAsync(rmCmd);
+                const mvCmd = `adb -s ${sn} shell  mv ${this.appDir}/${basename} ${this.appDir}/${appPackageName}`;
+                ColorConsole_1.default.info(`### Emulator ### mv CMD: ${mvCmd}`);
+                yield adbMiwt.execAdbCmdAsync(mvCmd);
             }
             else {
                 // 支持通配符处理: 1. 模拟器中mkdir创建目录 2. adb push ./XXXXX/* /XXX
                 const sourcePath = path_1.default.join(sourceRoot, './*');
-                const mkdirCmd = `adb -s ${sn} shell mkdir ${this.appRunDir}/${appPackageName}`;
-                shared_utils_1.ColorConsole.log(`### Emulator ### mkdir CMD: ${mkdirCmd}`);
+                const mkdirCmd = `adb -s ${sn} shell mkdir ${this.appDir}/${appPackageName}`;
+                ColorConsole_1.default.log(`### Emulator ### mkdir CMD: ${mkdirCmd}`);
                 yield adbMiwt.execAdbCmdAsync(mkdirCmd);
-                const pushCmd = `adb -s ${sn} push ${sourcePath} ${this.appRunDir}/${appPackageName}`;
-                shared_utils_1.ColorConsole.log(`### Emulator ### pushCmd CMD: ${pushCmd}`);
+                const pushCmd = `adb -s ${sn} push ${sourcePath} ${this.appDir}/${appPackageName}`;
+                ColorConsole_1.default.log(`### Emulator ### pushCmd CMD: ${pushCmd}`);
                 yield adbMiwt.execAdbCmdAsync(pushCmd);
             }
-            shared_utils_1.ColorConsole.info(`### Emulator push to ${this.appRunDir}/${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();
         });
     }
     /**
      * 重新推送，然后重启应用
      */
     pushAndReloadApp() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                // 1. 将整包重新推到miwear中（TODO：增量更新）
-                // adb push快应用到模拟器的/data/app目录
-                // aspect应用后续要考虑各种形状表盘的推包
-                const buildedFilesPath = this.isRpk
-                    ? this.projectPath
-                    : this.isDistributedApp
-                        ? ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.dist) ||
-                            path_1.default.join(this.projectPath, './build', `${this.projectInfo.package}.watch`)
-                        : path_1.default.join(this.projectPath, './build');
-                yield this.pushRpk(buildedFilesPath);
+                yield this.pushAndInstall();
+                yield this.reboot();
                 this.reloadApp();
             }
             catch (e) {
-                shared_utils_1.ColorConsole.error(`${e}`);
+                ColorConsole_1.default.error(`${e}`);
             }
         });
     }
@@ -289,13 +223,13 @@ class GoldfishInstance extends common_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const { package: appPackageName } = this.projectInfo;
             this.startupQuickApp(this.startOptions);
-            shared_utils_1.ColorConsole.info(`### Emulator start ${appPackageName} successfully`);
+            ColorConsole_1.default.info(`### Emulator start ${appPackageName} successfully`);
         });
     }
     reboot() {
         return __awaiter(this, void 0, void 0, function* () {
             const rebootCmd = `adb -s ${this.sn} shell reboot`;
-            shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${rebootCmd}`);
+            ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${rebootCmd}`);
             yield adbMiwt.execAdbCmdAsync(rebootCmd);
             return this.isConnected();
         });

package/lib/instance/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findInstance = exports.PreInstance = exports.OldGoldfishInstance = exports.MiwearInstance = exports.GoldfishInstance = exports.CommonInstance = void 0;
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const avd_1 = __importDefault(require("../avd"));
 const common_1 = __importDefault(require("./common"));
 exports.CommonInstance = common_1.default;
@@ -27,7 +27,7 @@ function findInstance(avdName, params) {
     const { sdkHome, avdHome } = params;
     const { avdImagePath } = new avd_1.default({ sdkHome, avdHome }).getVelaAvdInfo(avdName);
     if (!avdImagePath) {
-        shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
+        ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
         return;
     }
     if (avdImagePath.includes('vela-pre-4.0')) {

package/lib/instance/miwear.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import readline from 'readline';
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
 import CommonInstance from './common';
 /**
@@ -6,12 +8,11 @@ import CommonInstance from './common';
  */
 declare class MiwearInstance extends CommonInstance {
     private params;
-    quickappStartedFlag: RegExp;
-    private appPathInEmulator;
+    private appDir;
     private debugSocket?;
     private reconnectCount;
-    emulatorStartedFlag: RegExp;
-    installBol: boolean;
+    stdoutReadline: readline.Interface;
+    stderrReadline: readline.Interface;
     constructor(params: INewGoldfishInstanceParams);
     /**
      * 1. 启动模拟器
@@ -47,13 +48,9 @@ declare class MiwearInstance extends CommonInstance {
      * @param rpkPath rpk的绝对目录
      * @param targetDir 要将rpk放到模拟器的哪个目录下
      */
-    installRpkToAppList(rpkPath: string, targetDir: string): Promise<void>;
+    pushAndInstall(rpkPath: string, targetDir: string): Promise<void>;
     /** 使用am start启动快应用 */
     launchQuickapp(): Promise<void>;
-    /** 命令行模式下添加重复调用防止app无法拉起
-     * 主要用将子进程的流输出到主进程后，由于流写入的过多可能会影响事件循环
-     */
-    pmInstallApp(maxRepeats: number, count?: number): void;
     /** 连接模拟器中的调试服务，创建debugSocket
      * 主要用于热更新时，通过debugSocket通知调试服务更新页面
      * 设置了重连机制，会重复连接8次
@@ -67,6 +64,10 @@ declare class MiwearInstance extends CommonInstance {
     handleUpdate(): Promise<void>;
     /** 热更新时push目录 */
     pushBuild(): Promise<void>;
+    /** 通过命令行启动时，在watich模式下监听websocket消息，
+     * 在文件发生变动时，重新启动应用
+     */
+    restart(): Promise<void>;
     /** 在模拟器中重启快应用（基于am命令，需要保证镜像中已经有am功能）
      * 1. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
      * 2. nsh中执行am stop命令退出快应用