@aiot-toolkit/emulator 2.0.2-beta.5 → 2.0.2-beta.6

package/lib/instance/common.d.ts

@@ -10,33 +10,30 @@ declare class CommonInstance {
     projectPath: string;
     sdkHome: string;
     avdHome: string;
-    adbPort: number;
-    debugPort: number;
     velaAvdCls: VelaAvdCls;
     goldfishProcess: ChildProcess | undefined;
     isFirstStart: boolean;
     startOptions: IStartOptions | undefined;
     projectInfo: IManifest;
     isRpk: boolean;
+    sn?: string;
     constructor(params: INewGoldfishInstanceParams);
     /** 获取模拟器二进制文件所在位置 */
     getEmulatorBinPath(): string;
     /** 在goldfish模拟器中运行快应用 */
     start(options: IStartOptions): Promise<void>;
-    /** 在goldfish中启动快应用 */
-    startupQuickApp(options: IStartOptions): void;
-    /** 启动goldfish模拟器 */
-    startGoldfish(options: IStartOptions): Promise<void>;
-    /** 通过adb连接模拟器 */
-    connectGoldfish(): Promise<boolean>;
-    /** 将打包后的文件推到挂载的快应用目录 */
-    pushRpk(sourceRoot: string): Promise<void>;
+    /**
+     * 通过adb连接模拟器。
+     * 时间限制为10s，超时则表示连接失败
+     * @returns
+     */
+    connectGoldfish(): Promise<unknown>;
     /** 杀死进程 */
     killProcess(currProcess?: ChildProcess): void;
     /** 停止模拟器并释放相关资源 */
     stop(): Promise<void>;
     /** 重启模拟器 */
-    restart(): void;
+    restart(): Promise<void>;
     /** 创建server */
     createWebsockeServer(): Promise<void>;
 }

package/lib/instance/common.js

@@ -41,7 +41,6 @@ const adbMiwt = __importStar(require("@miwt/adb"));
 const child_process_1 = require("child_process");
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const portfinder_1 = __importDefault(require("portfinder"));
 const ws_1 = require("ws");
 const avd_1 = __importDefault(require("../avd"));
 const constants_1 = require("../static/constants");
@@ -51,8 +50,6 @@ const utils_1 = require("../utils");
  */
 class CommonInstance {
     constructor(params) {
-        this.adbPort = 5555;
-        this.debugPort = 10055;
         this.isFirstStart = true;
         this.projectPath = params.projectPath;
         this.sdkHome = params.sdkHome || constants_1.defaultSDKHome;
@@ -74,154 +71,44 @@ class CommonInstance {
     }
     /** 在goldfish模拟器中运行快应用 */
     start(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.startOptions = options;
-            // 启动模拟器
-            yield this.startGoldfish(options);
-            const connected = yield this.connectGoldfish();
-            if (connected) {
-                ColorConsole_1.default.log('### Emulator ### Goldfish emulator connected successfully');
-                if (this.isFirstStart && this.startOptions.serverPort) {
-                    yield this.createWebsockeServer();
-                }
-                // adb push快应用到模拟器的/data/app目录
-                const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
-                this.pushRpk(buildedFilesPath);
-                // 在模拟器中启动快应用
-                this.startupQuickApp(options);
-                this.isFirstStart = false;
-            }
-            else {
-                ColorConsole_1.default.throw('### Emulator ### Failed to connect emulator, please check whether the adb is normal');
-            }
-        });
-    }
-    /** 在goldfish中启动快应用 */
-    startupQuickApp(options) {
-        try {
-            let vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp app/${this.projectInfo.package} &`;
-            if (options.devtool) {
-                vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${this.projectInfo.package} &`;
-            }
-            ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
-            // vapp进程会一直pending，不会退出。这里必须加stdio: 'ignore'，否则快应用无法运行成功
-            adbMiwt.execAdbCmdAsync(vappCmd, { stdio: 'ignore', encoding: 'utf-8' });
-        }
-        catch (e) {
-            ColorConsole_1.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
-        }
-    }
-    /** 启动goldfish模拟器 */
-    startGoldfish(options) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const { avdName, devtool } = options;
-            const emulatorBin = this.getEmulatorBinPath();
-            ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
-            const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath } = avdInfo;
-            this.adbPort = yield portfinder_1.default.getPortPromise({ port: this.adbPort });
-            ColorConsole_1.default.log(`### Emulator ### adb port: ${this.adbPort}`);
-            if (!avdImagePath) {
-                return ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
-            }
-            const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
-            ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
-            // 端口映射
-            const adbPortMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
-            let debugPortMappingStr = '';
-            if (devtool) {
-                debugPortMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${this.debugPort}-10.0.2.15:101`;
-            }
-            // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
-            const systemImageBin = path_1.default.resolve(this.sdkHome, 'tools/image/system.img');
-            const dataImageBin = path_1.default.resolve(this.sdkHome, 'tools/image/data.img');
-            const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBin} \
--device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
--drive index=1,id=userdata,if=none,format=raw,file=${dataImageBin} \
--device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
--device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
-            // vnc配置
-            let windowStr = '';
-            let vncStr = '';
-            if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.vncPort) {
-                windowStr = '-no-window';
-                const portSuffix = this.startOptions.vncPort - constants_1.defaultVncPort;
-                vncStr = `-vnc :${portSuffix}`;
-            }
-            const stdioType = options.disableNSH ? 'pipe' : 'inherit';
-            // 启动goldfish的命令和参数
-            const cmd = `${emulatorBin} -nuttx -avd ${avdName} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${adbPortMappingStr} ${debugPortMappingStr} -qemu ${windowStr} ${vncStr} ${imageMountStr}`;
-            const spawnArgs = cmd.split(' ');
-            const spawnBin = spawnArgs.shift();
-            ColorConsole_1.default.log(`### Emulator ### Start CMD: ${cmd}`);
-            return new Promise((resolve) => {
-                var _a, _b;
-                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: stdioType, shell: true });
-                if (options.disableNSH) {
-                    (_a = this.goldfishProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                        console.log(data.toString());
-                        if (data.toString().includes('(NSH)')) {
-                            ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
-                            resolve();
-                        }
-                    });
-                    (_b = this.goldfishProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                        console.log(data.toString());
-                    });
-                }
-                else {
-                    setTimeout(() => {
-                        ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
-                        resolve();
-                    }, 2000);
-                }
-                this.goldfishProcess.on('exit', (code) => {
-                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
-                });
-            });
-        });
+        return __awaiter(this, void 0, void 0, function* () { });
     }
-    /** 通过adb连接模拟器 */
+    /**
+     * 通过adb连接模拟器。
+     * 时间限制为10s，超时则表示连接失败
+     * @returns
+     */
     connectGoldfish() {
         return __awaiter(this, void 0, void 0, function* () {
-            let adbConnected = false;
+            let adbConnected = false; // adb是否连接成功
+            let enableLoop = true; // 是否允许循环，用于终止adb的连接
             const connectFn = () => __awaiter(this, void 0, void 0, function* () {
-                const sn = `127.0.0.1:${this.adbPort}`;
-                while (!adbConnected) {
+                while (enableLoop && !adbConnected) {
                     const adbKillCmd = `adb kill-server`;
                     ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
                     adbMiwt.execAdbCmdSync(adbKillCmd);
-                    const adbConnectCmd = `adb connect ${sn}`;
+                    const adbConnectCmd = `adb connect ${this.sn}`;
                     ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
                     const str = adbMiwt.execAdbCmdSync(adbConnectCmd);
                     ColorConsole_1.default.log(`### Emulator ### ${str}`);
                     const devices = yield adbMiwt.getAdbDevices();
                     ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
                     adbConnected =
-                        devices.filter((item) => item.sn === sn && item.status === 'device').length > 0;
+                        devices.filter((item) => item.sn === this.sn && item.status === 'device').length > 0;
                 }
-                Promise.resolve(adbConnected);
+                return Promise.resolve(adbConnected);
             });
-            yield Promise.race([
+            const res = yield Promise.race([
                 connectFn(),
                 new Promise((resolve) => {
-                    setTimeout(() => resolve(false), 600 * 1000);
+                    setTimeout(() => {
+                        enableLoop = false;
+                        // 超时则认为adb没有连接成功
+                        resolve(false);
+                    }, 10 * 1000);
                 })
             ]);
-            return adbConnected;
-        });
-    }
-    /** 将打包后的文件推到挂载的快应用目录 */
-    pushRpk(sourceRoot) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sn = `127.0.0.1:${this.adbPort}`;
-            const { package: appPackageName } = UxFileUtils_1.default.getMainfestInfo(this.projectPath);
-            const appRunDir = '/data/app';
-            ColorConsole_1.default.log(`### Emulator ### Pushing ${appPackageName} to ${appRunDir}`);
-            (0, child_process_1.execSync)(`adb -s ${sn} shell mkdir ${appRunDir}/${appPackageName}`, { stdio: 'ignore' });
-            yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourceRoot}/* ${appRunDir}/${appPackageName}`);
-            ColorConsole_1.default.log(`### Emulator ### Push ${appPackageName} to ${appRunDir} successfully`);
+            return res;
         });
     }
     /** 杀死进程 */
@@ -262,8 +149,10 @@ class CommonInstance {
     }
     /** 重启模拟器 */
     restart() {
-        this.stop();
-        this.start(this.startOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.stop();
+            this.start(this.startOptions);
+        });
     }
     /** 创建server */
     createWebsockeServer() {

package/lib/instance/dev.d.ts

@@ -3,13 +3,33 @@ import CommonInstance from './common';
 declare class GoldfishInstance extends CommonInstance {
     private appRunDir;
     constructor(params: INewGoldfishInstanceParams);
-    /** 在goldfish模拟器中运行快应用 */
+    /**
+     * 1. 启动模拟器
+     * 2. 启动成功后，adb连接模拟器
+     * 3. 连接成功后，在模拟器中启动快应用
+     */
     start(options: IStartOptions): Promise<void>;
-    /** 在goldfish中启动快应用 */
+    /**
+     * 在模拟器中启动快应用
+     * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
+     * @param options
+     */
     startupQuickApp(options: IStartOptions): Promise<void>;
-    /** 启动goldfish模拟器 */
+    /**
+     * 启动模拟器
+     * 1. 通过options生成模拟器的启动命令
+     * 2. 执行启动命令
+     * 3. 判断模拟器是否启动成功
+     *    3.1 若disableNSH=true，输出流中匹配到(NSH)，认为模拟器启动成功了
+     *    3.2 若disableNSH=false，认为2s过后模拟器启动成功了
+     * @param options
+     * @returns
+     */
     startGoldfish(options: IStartOptions): Promise<void>;
-    /** 将打包后的文件推到挂载的快应用目录 */
+    /**
+     * 将目录通过adb push到模拟器中
+     * @param sourceRoot
+     */
     pushRpk(sourceRoot: string): Promise<void>;
 }
 export default GoldfishInstance;

package/lib/instance/dev.js

@@ -39,18 +39,23 @@ const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/C
 const adbMiwt = __importStar(require("@miwt/adb"));
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
-const portfinder_1 = __importDefault(require("portfinder"));
 const constants_1 = require("../static/constants");
 const common_1 = __importDefault(require("./common"));
+const os_1 = __importDefault(require("os"));
 class GoldfishInstance extends common_1.default {
     constructor(params) {
         super(params);
         this.appRunDir = '/data/app';
     }
-    /** 在goldfish模拟器中运行快应用 */
+    /**
+     * 1. 启动模拟器
+     * 2. 启动成功后，adb连接模拟器
+     * 3. 连接成功后，在模拟器中启动快应用
+     */
     start(options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.startOptions = options;
+            this.sn = `127.0.0.1:${this.startOptions.adbPort}`;
             // 启动模拟器
             yield this.startGoldfish(options);
             const connected = yield this.connectGoldfish();
@@ -71,14 +76,18 @@ class GoldfishInstance extends common_1.default {
             }
         });
     }
-    /** 在goldfish中启动快应用 */
+    /**
+     * 在模拟器中启动快应用
+     * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
+     * @param options
+     */
     startupQuickApp(options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const { package: packageName } = this.projectInfo;
-                let vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp app/${packageName} &`;
+                let vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp app/${packageName} &`;
                 if (options.devtool) {
-                    vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
+                    vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
                 }
                 ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
                 // vapp进程会一直pending，不会退出。这里必须加stdio: 'ignore'，否则快应用无法运行成功
@@ -89,7 +98,16 @@ class GoldfishInstance extends common_1.default {
             }
         });
     }
-    /** 启动goldfish模拟器 */
+    /**
+     * 启动模拟器
+     * 1. 通过options生成模拟器的启动命令
+     * 2. 执行启动命令
+     * 3. 判断模拟器是否启动成功
+     *    3.1 若disableNSH=true，输出流中匹配到(NSH)，认为模拟器启动成功了
+     *    3.2 若disableNSH=false，认为2s过后模拟器启动成功了
+     * @param options
+     * @returns
+     */
     startGoldfish(options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -98,21 +116,20 @@ class GoldfishInstance extends common_1.default {
             ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
             const { avdArch, avdImagePath } = avdInfo;
-            this.adbPort = yield portfinder_1.default.getPortPromise({ port: this.adbPort });
-            ColorConsole_1.default.log(`### Emulator ### adb port: ${this.adbPort}`);
+            ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
             if (!avdImagePath) {
                 return ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
             }
             const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
             ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
             // 端口映射
-            let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
+            let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
             if (devtool) {
-                portMappingStr += `,hostfwd=tcp:127.0.0.1:${this.debugPort}-10.0.2.15:101`;
+                portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
             }
             // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
-            const systemImageBin = path_1.default.resolve(this.sdkHome, 'tools/image/system.img');
-            const dataImageBin = path_1.default.resolve(this.sdkHome, 'tools/image/data.img');
+            const systemImageBin = path_1.default.resolve(avdImagePath, 'system.img');
+            const dataImageBin = path_1.default.resolve(avdImagePath, 'data.img');
             const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBin} \
 -device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
 -drive index=1,id=userdata,if=none,format=raw,file=${dataImageBin} \
@@ -135,23 +152,26 @@ class GoldfishInstance extends common_1.default {
             return new Promise((resolve) => {
                 var _a, _b;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: stdioType, shell: true });
+                (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+                    const stderrCb = options.stderrCallback || console.log;
+                    stderrCb(data.toString());
+                });
+                this.goldfishProcess.on('exit', (code) => {
+                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+                    if (options.exitCallback) {
+                        options.exitCallback(code);
+                    }
+                });
                 if (options.disableNSH) {
-                    (_a = this.goldfishProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                        if (options.stdoutCallback) {
-                            options.stdoutCallback(data);
-                        }
-                        else {
-                            console.log(data.toString());
-                        }
+                    (_b = this.goldfishProcess.stdout) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+                        const msg = data.toString();
+                        const stdoutCb = options.stdoutCallback || console.log;
+                        stdoutCb(msg);
                         if (data.toString().includes('(NSH)')) {
                             ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
                             resolve();
                         }
                     });
-                    (_b = this.goldfishProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                        const stderrCb = options.stderrCallback || console.log;
-                        stderrCb(data.toString());
-                    });
                 }
                 else {
                     setTimeout(() => {
@@ -159,25 +179,31 @@ class GoldfishInstance extends common_1.default {
                         resolve();
                     }, 2000);
                 }
-                this.goldfishProcess.on('exit', (code) => {
-                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
-                    if (options.exitCallback) {
-                        options.exitCallback(code);
-                    }
-                });
             });
         });
     }
-    /** 将打包后的文件推到挂载的快应用目录 */
+    /**
+     * 将目录通过adb push到模拟器中
+     * @param sourceRoot
+     */
     pushRpk(sourceRoot) {
         return __awaiter(this, void 0, void 0, function* () {
-            const sn = `127.0.0.1:${this.adbPort}`;
+            const sn = `127.0.0.1:${this.startOptions.adbPort}`;
             const { package: appPackageName } = this.projectInfo;
-            const sourcePath = path_1.default.resolve(sourceRoot, './*');
-            ColorConsole_1.default.log(`### Emulator ### Pushing ${appPackageName} to ${this.appRunDir}`);
-            yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} shell mkdir ${this.appRunDir}/${appPackageName}`);
-            yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourcePath} ${this.appRunDir}/${appPackageName}`);
-            ColorConsole_1.default.log(`### Emulator ### Push ${appPackageName} to ${this.appRunDir} successfully`);
+            // 获取最后一层目录，比如build
+            const basename = path_1.default.basename(sourceRoot);
+            if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
+                // windows系统或者项目路径有空格：1. adb push目录；2. 在模拟器中使用mv命令重命名
+                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourceRoot} ${this.appRunDir}`);
+                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} shell  mv ${this.appRunDir}/${basename} ${this.appRunDir}/${appPackageName}`);
+            }
+            else {
+                // 支持通配符处理: 1. 模拟器中mkdir创建目录 2. adb push ./XXXXX/* /XXX
+                const sourcePath = path_1.default.resolve(sourceRoot, './*');
+                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} shell mkdir ${this.appRunDir}/${appPackageName}`);
+                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push "${sourcePath}" ${this.appRunDir}/${appPackageName}`);
+            }
+            ColorConsole_1.default.info(`### Emulator push to ${this.appRunDir}/${appPackageName} successfully`);
         });
     }
 }

package/lib/instance/miwear.d.ts

@@ -29,10 +29,12 @@ declare class MiwearInstance extends CommonInstance {
     startGoldfish(options: IStartOptions): Promise<void>;
     /**
      * 通过adb连接模拟器。
-     * 时间限制为10分钟，超时则表示连接失败
+     * 时间限制为2分钟，超时则表示连接失败
+     * 注意：两次connect之间不能等待，否则在disableNSH=true且有vncPort的模式下，模拟器启动成功了，但是vnc可能还没连接上
+     *      时间限制不能太短，否则模拟器里面的adbd进程还没初始化成功
      * @returns
      */
-    connectGoldfish(): Promise<boolean>;
+    connectGoldfish(): Promise<unknown>;
     /**
      * 在模拟器中启动快应用
      * 1. 检查release目录是否有打包好的rpk
@@ -62,6 +64,14 @@ declare class MiwearInstance extends CommonInstance {
      * 3. 发送Page.reload命令给调试服务，通知更新
     */
     handleUpdate(): Promise<void>;
+    /** 热更新时push目录 */
+    pushBuild(): Promise<void>;
+    /** 在模拟器中重启快应用（基于am命令，需要保证镜像中已经有am功能）
+     * 1. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
+     * 2. nsh中执行am stop命令退出快应用
+     * 3. nsh中执行am start命令启动快应用
+    */
+    reloadApp(): Promise<void>;
     /**
      * 创建server端，监听打包过程中client端发来的消息
      */

package/lib/instance/miwear.js

@@ -41,7 +41,6 @@ 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 portfinder_1 = __importDefault(require("portfinder"));
 const ws_1 = __importStar(require("ws"));
 const constants_1 = require("../static/constants");
 const utils_1 = require("../utils");
@@ -66,6 +65,7 @@ class MiwearInstance extends common_1.default {
     start(options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.startOptions = options;
+            this.sn = `127.0.0.1:${this.startOptions.adbPort}`;
             // 启动模拟器
             yield this.startGoldfish(options);
             // adb连接模拟器
@@ -105,18 +105,16 @@ class MiwearInstance extends common_1.default {
             // 获取vela镜像的绝对路径
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
             const { avdArch, avdImagePath } = avdInfo;
-            this.adbPort = yield portfinder_1.default.getPortPromise({ port: this.adbPort });
-            ColorConsole_1.default.log(`### Emulator ### adb port: ${this.adbPort}`);
+            ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
             if (!avdImagePath) {
                 return ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
             }
             const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
             ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
             // 端口映射，adb端口和debug端口
-            let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
+            let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
             if (devtool) {
-                this.debugPort = yield portfinder_1.default.getPortPromise({ port: this.debugPort });
-                portMappingStr += `,hostfwd=tcp:127.0.0.1:${this.debugPort}-10.0.2.15:101`;
+                portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
             }
             // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
             const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.bin');
@@ -183,19 +181,21 @@ class MiwearInstance extends common_1.default {
     }
     /**
      * 通过adb连接模拟器。
-     * 时间限制为10分钟，超时则表示连接失败
+     * 时间限制为2分钟，超时则表示连接失败
+     * 注意：两次connect之间不能等待，否则在disableNSH=true且有vncPort的模式下，模拟器启动成功了，但是vnc可能还没连接上
+     *      时间限制不能太短，否则模拟器里面的adbd进程还没初始化成功
      * @returns
      */
     connectGoldfish() {
         return __awaiter(this, void 0, void 0, function* () {
-            let adbConnected = false;
+            let adbConnected = false; // adb是否连接成功
+            let enableLoop = true; // 是否允许循环，用于终止adb的连接
             const connectFn = () => __awaiter(this, void 0, void 0, function* () {
-                const sn = `127.0.0.1:${this.adbPort}`;
-                while (!adbConnected) {
+                while (enableLoop && !adbConnected) {
                     const adbKillCmd = `adb kill-server`;
                     ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
                     yield adbMiwt.execAdbCmdAsync(adbKillCmd);
-                    const adbConnectCmd = `adb connect ${sn}`;
+                    const adbConnectCmd = `adb connect ${this.sn}`;
                     ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
                     const str = yield adbMiwt.execAdbCmdAsync(adbConnectCmd);
                     ColorConsole_1.default.log(`### Emulator ### ${str}`);
@@ -203,17 +203,21 @@ class MiwearInstance extends common_1.default {
                     const devices = yield adbMiwt.getAdbDevices();
                     ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
                     adbConnected =
-                        devices.filter((item) => item.sn === sn && item.status === 'device').length > 0;
+                        devices.filter((item) => item.sn === this.sn && item.status === 'device').length > 0;
                 }
-                Promise.resolve(adbConnected);
+                return Promise.resolve(adbConnected);
             });
-            yield Promise.race([
+            const res = yield Promise.race([
                 connectFn(),
                 new Promise((resolve) => {
-                    setTimeout(() => resolve(false), 600 * 1000);
+                    setTimeout(() => {
+                        enableLoop = false;
+                        // 超时则认为adb没有连接成功
+                        resolve(false);
+                    }, 120 * 1000);
                 })
             ]);
-            return adbConnected;
+            return res;
         });
     }
     /**
@@ -240,13 +244,12 @@ class MiwearInstance extends common_1.default {
             }
             const rpkPath = path_1.default.resolve(releaseDir, files[0]);
             // 调试模式需要push一个文件至miwear中
-            const sn = `127.0.0.1:${this.adbPort}`;
             if (options.devtool) {
                 const debuggerCfgFile = path_1.default.join(__dirname, '../static/debugger_ip.cfg');
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${debuggerCfgFile} /data/debugger_ip.cfg`);
+                yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} push ${debuggerCfgFile} /data/debugger_ip.cfg`);
             }
             else {
-                adbMiwt.execAdbCmdAsync(`adb -s ${sn} shell rm /data/debugger_ip.cfg`);
+                adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell rm /data/debugger_ip.cfg`);
             }
             this.installRpkToAppList(rpkPath, this.appPathInEmulator);
         });
@@ -261,16 +264,15 @@ class MiwearInstance extends common_1.default {
     installRpkToAppList(rpkPath, targetDir) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const sn = `127.0.0.1:${this.adbPort}`;
                 const { package: packageName } = this.projectInfo;
                 // 1. adb push应用的rpk
                 const targetPath = `${targetDir}/${packageName}.rpk`;
-                const pushCmd = `adb -s ${sn} push "${rpkPath}" ${targetPath}`;
+                const pushCmd = `adb -s ${this.sn} push "${rpkPath}" ${targetPath}`;
                 ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
                 yield adbMiwt.execAdbCmdAsync(pushCmd);
                 yield (0, utils_1.sleep)(1000);
                 // 2. 安装应用(pm install时如何应用重名会覆盖)
-                const installCmd = `adb -s ${sn} shell pm install ${targetPath}`;
+                const installCmd = `adb -s ${this.sn} shell pm install ${targetPath}`;
                 ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
                 adbMiwt.execAdbCmdAsync(installCmd);
             }
@@ -285,10 +287,11 @@ class MiwearInstance extends common_1.default {
      */
     initDebugSocket() {
         return new Promise((resolve, reject) => {
+            var _a;
             if (this.debugSocket && this.debugSocket.OPEN) {
                 return resolve();
             }
-            this.debugSocket = new ws_1.default(`ws://localhost:${this.debugPort}`);
+            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();
@@ -327,22 +330,7 @@ class MiwearInstance extends common_1.default {
                 this.reconnectCount = 0;
                 yield this.initDebugSocket();
                 // 1. 将整包重新推到miwear中（TODO：增量更新）
-                const sn = `127.0.0.1:${this.adbPort}`;
-                const { package: appPackageName } = this.projectInfo;
-                // windows平台adb push时无法使用通配符，需另外处理; 
-                // 项目路径包含空格时，无法通过加引号来使用 * 通配符
-                if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
-                    const rmCmd = `adb -s ${sn} shell rm -r ${this.appPathInEmulator}/${appPackageName}`;
-                    yield adbMiwt.execAdbCmdAsync(rmCmd);
-                    const sourcePath = path_1.default.resolve(this.projectPath, './build');
-                    const pushCmd = `adb -s ${sn} push "${sourcePath}" ${this.appPathInEmulator}/${appPackageName}`;
-                    yield adbMiwt.execAdbCmdAsync(pushCmd);
-                }
-                else {
-                    const sourcePath = path_1.default.resolve(this.projectPath, './build/*');
-                    yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourcePath} ${this.appPathInEmulator}/${appPackageName}`);
-                }
-                ColorConsole_1.default.info(`### Emulator push to ${this.appPathInEmulator}/${appPackageName} successfully`);
+                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: {} }));
@@ -353,6 +341,52 @@ class MiwearInstance extends common_1.default {
             }
         });
     }
+    /** 热更新时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.appPathInEmulator}/${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}`;
+                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}`);
+            }
+            ColorConsole_1.default.info(`### Emulator push to ${this.appPathInEmulator}/${appPackageName} successfully`);
+        });
+    }
+    /** 在模拟器中重启快应用（基于am命令，需要保证镜像中已经有am功能）
+     * 1. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
+     * 2. nsh中执行am stop命令退出快应用
+     * 3. nsh中执行am start命令启动快应用
+    */
+    reloadApp() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // 1. 将整包重新推到miwear中（TODO：增量更新）
+                const { package: appPackageName } = this.projectInfo;
+                yield this.pushBuild();
+                // 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}`);
+            }
+        });
+    }
     /**
      * 创建server端，监听打包过程中client端发来的消息
      */

package/lib/instance/preDev.d.ts

@@ -40,12 +40,6 @@ declare class OldGoldfishInstance extends CommonInstance {
      * @returns
      */
     startGoldfish(options: IStartOptions): Promise<void>;
-    /**
-     * 通过adb连接模拟器。
-     * 时间限制为10分钟，超时则表示连接失败
-     * @returns
-     */
-    connectGoldfish(): Promise<boolean>;
     /**
      * 推送文件到本地的${sdkHome}/qa/app/${packageName}目录
      * @param sourceRoot 源目录

package/lib/instance/preDev.js

@@ -64,9 +64,10 @@ class OldGoldfishInstance extends common_1.default {
      */
     start(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.startOptions = options;
+            this.sn = `127.0.0.1:${this.startOptions.adbPort}`;
             // host启动9p server
             yield this.ensure9pServerRunnning();
-            this.startOptions = options;
             // 将rpk推到host的./export/qa/app目录
             const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
             this.pushRpk(buildedFilesPath);
@@ -99,13 +100,13 @@ class OldGoldfishInstance extends common_1.default {
         try {
             const { package: packageName } = this.projectInfo;
             const appMountDir = path_1.default.resolve(this.sdkHome, 'qa');
-            const mountCmd = `adb -s 127.0.0.1:${this.adbPort} shell mount -t v9fs -o tag=10.0.2.2,port=${this.host9pPort},aname=${appMountDir} /data`;
+            const mountCmd = `adb -s 127.0.0.1:${options.adbPort} shell mount -t v9fs -o tag=10.0.2.2,port=${this.host9pPort},aname=${appMountDir} /data`;
             ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${mountCmd}`);
             adbMiwt.execAdbCmdSync(mountCmd);
-            let vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp app/${packageName} &`;
+            let vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp app/${packageName} &`;
             // 调试情况下，需要加--jsdebugger=10.0.2.15:101
             if (options.devtool) {
-                vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
+                vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
             }
             ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
             // vapp进程会一直pending，不会退出。这里必须加stdio: 'ignore'，否则快应用无法运行成功
@@ -176,19 +177,17 @@ class OldGoldfishInstance extends common_1.default {
             // 获取vela镜像的绝对路径
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
             const { avdArch, avdImagePath } = avdInfo;
-            this.adbPort = yield portfinder_1.default.getPortPromise({ port: this.adbPort });
-            ColorConsole_1.default.log(`### Emulator ### adb port: ${this.adbPort}`);
+            ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
             if (!avdImagePath) {
                 return ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
             }
             const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
             ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
             // 端口映射，adb端口和debug端口
-            let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
+            let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
             if (devtool) {
-                this.debugPort = yield portfinder_1.default.getPortPromise({ port: this.debugPort });
-                ColorConsole_1.default.log(`### Emulator ### debug port: ${this.debugPort}`);
-                portMappingStr += `,hostfwd=tcp:127.0.0.1:${this.debugPort}-10.0.2.15:101`;
+                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配置
@@ -256,40 +255,6 @@ class OldGoldfishInstance extends common_1.default {
             });
         });
     }
-    /**
-     * 通过adb连接模拟器。
-     * 时间限制为10分钟，超时则表示连接失败
-     * @returns
-     */
-    connectGoldfish() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let adbConnected = false;
-            const connectFn = () => __awaiter(this, void 0, void 0, function* () {
-                const sn = `127.0.0.1:${this.adbPort}`;
-                while (!adbConnected) {
-                    const adbKillCmd = `adb kill-server`;
-                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
-                    adbMiwt.execAdbCmdSync(adbKillCmd);
-                    const adbConnectCmd = `adb connect ${sn}`;
-                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
-                    const str = adbMiwt.execAdbCmdSync(adbConnectCmd);
-                    ColorConsole_1.default.log(`### Emulator ### ${str}`);
-                    const devices = yield adbMiwt.getAdbDevices();
-                    ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
-                    adbConnected =
-                        devices.filter((item) => item.sn === sn && item.status === 'device').length > 0;
-                }
-                Promise.resolve(adbConnected);
-            });
-            yield Promise.race([
-                connectFn(),
-                new Promise((resolve) => {
-                    setTimeout(() => resolve(false), 600 * 1000);
-                })
-            ]);
-            return adbConnected;
-        });
-    }
     /**
      * 推送文件到本地的${sdkHome}/qa/app/${packageName}目录
      * @param sourceRoot 源目录

package/lib/static/constants.d.ts

@@ -6,6 +6,8 @@ export declare const defaultSkinHome: string;
 export declare const defaultQuickappHome: string;
 export declare const defaultToolsHome: string;
 export declare const defaultVncPort = 5900;
+export declare const defaultAdbPort = 5555;
+export declare const defaultDebugPort = 10055;
 export declare const VelaImageVersionList: {
     label: string;
     value: string;

package/lib/static/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmulatorEnvVersion = exports.VelaImageVersionList = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultQuickappHome = exports.defaultSkinHome = exports.defaultEmulatorHome = exports.defaultImageHome = exports.defaultAvdHome = exports.defaultSDKHome = void 0;
+exports.EmulatorEnvVersion = exports.VelaImageVersionList = exports.defaultDebugPort = exports.defaultAdbPort = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultQuickappHome = exports.defaultSkinHome = exports.defaultEmulatorHome = exports.defaultImageHome = exports.defaultAvdHome = exports.defaultSDKHome = void 0;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 exports.defaultSDKHome = path_1.default.resolve(os_1.default.homedir(), '.export');
@@ -14,6 +14,8 @@ exports.defaultSkinHome = path_1.default.resolve(exports.defaultSDKHome, 'skins'
 exports.defaultQuickappHome = path_1.default.resolve(exports.defaultSDKHome, 'qa');
 exports.defaultToolsHome = path_1.default.resolve(exports.defaultSDKHome, 'tools');
 exports.defaultVncPort = 5900;
+exports.defaultAdbPort = 5555;
+exports.defaultDebugPort = 10055;
 exports.VelaImageVersionList = [
     {
         label: 'vela正式版（4.0）',

package/lib/typing/Instance.d.ts

@@ -12,6 +12,8 @@ export interface IStartOptions {
     disableNSH?: boolean;
     serverPort?: number;
     vncPort?: number;
+    adbPort: number;
+    debugPort?: number;
     stdoutCallback?: (buffer: Buffer) => void;
     stderrCallback?: (buffer: Buffer) => void;
     exitCallback?: (code: number | null) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.5",
+  "version": "2.0.2-beta.6",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,8 +35,8 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.5",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.5",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.6",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.6",
     "find-process": "^1.4.7",
     "portfinder": "^1.0.32"
   },
@@ -44,5 +44,5 @@
     "@types/fs-extra": "^11.0.4",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "8c18753992c453c6569a3125378e75fbf4760a1f"
+  "gitHead": "b9b99afff176075380c2ec95b43797d696c393c1"
 }