@aiot-toolkit/emulator 2.0.2-dev.3 → 2.0.2-dev.5

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { default as VelaAvdCls } from './avd';
-import { default as GoldfishInstance } from './instance/goldfish';
+export * from './instance';
 export * from './typing/Avd';
 export * from './typing/Instance';
-export { GoldfishInstance, VelaAvdCls };
+export { VelaAvdCls };

package/lib/index.js

@@ -17,10 +17,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VelaAvdCls = exports.GoldfishInstance = void 0;
+exports.VelaAvdCls = void 0;
 const avd_1 = __importDefault(require("./avd"));
 Object.defineProperty(exports, "VelaAvdCls", { enumerable: true, get: function () { return avd_1.default; } });
-const goldfish_1 = __importDefault(require("./instance/goldfish"));
-Object.defineProperty(exports, "GoldfishInstance", { enumerable: true, get: function () { return goldfish_1.default; } });
+__exportStar(require("./instance"), exports);
 __exportStar(require("./typing/Avd"), exports);
 __exportStar(require("./typing/Instance"), exports);

package/lib/instance/{goldfish.d.ts → common.d.ts}

@@ -1,19 +1,23 @@
 /// <reference types="node" />
+import IManifest from '@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/interface/IManifest';
 import { ChildProcess } from 'child_process';
+import VelaAvdCls from '../avd';
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
-declare class GoldfishInstance {
-    private projectPath;
-    private sdkHome;
-    private avdHome;
-    private adbPort;
+/**
+ * CommonInstance
+ */
+declare class CommonInstance {
+    projectPath: string;
+    sdkHome: string;
+    avdHome: string;
+    adbPort: number;
     debugPort: number;
-    private host9pPort;
-    private velaAvdCls;
-    private packageName;
+    velaAvdCls: VelaAvdCls;
     goldfishProcess: ChildProcess | undefined;
-    v9fsProcess: ChildProcess | undefined;
     isFirstStart: boolean;
-    private startOptions;
+    startOptions: IStartOptions | undefined;
+    projectInfo: IManifest;
+    isRpk: boolean;
     constructor(params: INewGoldfishInstanceParams);
     /** 获取模拟器二进制文件所在位置 */
     getEmulatorBinPath(): string;
@@ -21,21 +25,19 @@ declare class GoldfishInstance {
     start(options: IStartOptions): Promise<void>;
     /** 在goldfish中启动快应用 */
     startupQuickApp(options: IStartOptions): void;
-    /** host启动9pServer */
-    ensure9pServerRunnning(): Promise<void>;
     /** 启动goldfish模拟器 */
     startGoldfish(options: IStartOptions): Promise<void>;
     /** 通过adb连接模拟器 */
     connectGoldfish(): Promise<boolean>;
     /** 将打包后的文件推到挂载的快应用目录 */
-    pushRpk(): void;
+    pushRpk(sourceRoot: string): Promise<void>;
     /** 杀死进程 */
     killProcess(currProcess?: ChildProcess): void;
     /** 停止模拟器并释放相关资源 */
-    stop(): void;
+    stop(): Promise<void>;
     /** 重启模拟器 */
     restart(): void;
     /** 创建server */
     createWebsockeServer(): Promise<void>;
 }
-export default GoldfishInstance;
+export default CommonInstance;

package/lib/instance/{goldfish1.js → common.js}

@@ -39,8 +39,6 @@ const UxFileUtils_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/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 find_process_1 = __importDefault(require("find-process"));
-const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const portfinder_1 = __importDefault(require("portfinder"));
@@ -48,21 +46,23 @@ const ws_1 = require("ws");
 const avd_1 = __importDefault(require("../avd"));
 const constants_1 = require("../static/constants");
 const utils_1 = require("../utils");
-class GoldfishInstance {
+/**
+ * CommonInstance
+ */
+class CommonInstance {
     constructor(params) {
         this.adbPort = 5555;
         this.debugPort = 10055;
-        this.host9pPort = 7878;
         this.isFirstStart = true;
         this.projectPath = params.projectPath;
         this.sdkHome = params.sdkHome || constants_1.defaultSDKHome;
         this.avdHome = params.avdHome || constants_1.defaultAvdHome;
+        this.isRpk = params.sourceRoot === './';
         this.velaAvdCls = new avd_1.default({
             sdkHome: this.sdkHome,
             avdHome: this.avdHome
         });
-        const { package: appPackageName } = UxFileUtils_1.default.getMainfestInfo(this.projectPath, params.sourceRoot);
-        this.packageName = appPackageName;
+        this.projectInfo = UxFileUtils_1.default.getMainfestInfo(this.projectPath, params.sourceRoot);
     }
     /** 获取模拟器二进制文件所在位置 */
     getEmulatorBinPath() {
@@ -85,7 +85,8 @@ class GoldfishInstance {
                     yield this.createWebsockeServer();
                 }
                 // adb push快应用到模拟器的/data/app目录
-                this.pushRpk();
+                const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
+                this.pushRpk(buildedFilesPath);
                 // 在模拟器中启动快应用
                 this.startupQuickApp(options);
                 this.isFirstStart = false;
@@ -98,9 +99,9 @@ class GoldfishInstance {
     /** 在goldfish中启动快应用 */
     startupQuickApp(options) {
         try {
-            let vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp app/${this.packageName} &`;
+            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.packageName} &`;
+                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'，否则快应用无法运行成功
@@ -110,44 +111,6 @@ class GoldfishInstance {
             ColorConsole_1.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
         }
     }
-    /** host启动9pServer */
-    ensure9pServerRunnning() {
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const yaFileName = os_1.default.platform() === 'win32' ? 'ya-vm-file-server.exe' : 'ya-vm-file-server';
-            const pidList = yield (0, find_process_1.default)('name', yaFileName);
-            if (pidList.length > 0) {
-                ColorConsole_1.default.log('### Emulator ### 9p server started in host');
-                return resolve();
-            }
-            ColorConsole_1.default.log('### Emulator ### Starting 9p server in host');
-            const quickappMountDir = path_1.default.resolve(this.sdkHome, 'qa');
-            const toolsHome = path_1.default.resolve(this.sdkHome, 'tools');
-            const serverBinPath = path_1.default.resolve(toolsHome, yaFileName);
-            fs_1.default.chmodSync(serverBinPath, 0o777);
-            this.host9pPort = yield portfinder_1.default.getPortPromise({ port: 7878 });
-            const address = `127.0.0.1:${this.host9pPort}`;
-            this.v9fsProcess = (0, child_process_1.spawn)(serverBinPath, [
-                '--mount-point',
-                quickappMountDir,
-                '--network-address',
-                address,
-                '--debug'
-            ]);
-            (_a = this.v9fsProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                const output = data.toString();
-                if (output.match(/Server started, listening on: 127.0.0.1:(\d+)/)) {
-                    ColorConsole_1.default.log(output);
-                    ColorConsole_1.default.log('### Emulator ### 9p server starts successfully');
-                    return resolve();
-                }
-            });
-            this.v9fsProcess.on('exit', (code) => {
-                ColorConsole_1.default.error(`### Emulator ### ya-vm-file-server exited with code ${code}`);
-                return reject();
-            });
-        }));
-    }
     /** 启动goldfish模拟器 */
     startGoldfish(options) {
         var _a;
@@ -250,14 +213,16 @@ class GoldfishInstance {
         });
     }
     /** 将打包后的文件推到挂载的快应用目录 */
-    pushRpk() {
-        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 /data/app/${appPackageName}`, { stdio: 'ignore' });
-        (0, child_process_1.execSync)(`adb -s ${sn} push ./build/* /data/app/${appPackageName}`, { cwd: this.projectPath, stdio: 'ignore' });
-        ColorConsole_1.default.log(`### Emulator ### Push ${appPackageName} to ${appRunDir} successfully`);
+    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`);
+        });
     }
     /** 杀死进程 */
     killProcess(currProcess) {
@@ -281,26 +246,23 @@ class GoldfishInstance {
     }
     /** 停止模拟器并释放相关资源 */
     stop() {
-        if (this.goldfishProcess) {
-            // Linux删除goldfishProcess后，子进程仍存在，导致模拟器窗口未关闭
-            // 这里的作用是手动删除创建出来的子进程
-            if (os_1.default.platform() === 'linux' && this.goldfishProcess.pid) {
-                process.kill(this.goldfishProcess.pid + 1);
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.goldfishProcess) {
+                // Linux删除goldfishProcess后，子进程仍存在，导致模拟器窗口未关闭
+                // 这里的作用是手动删除创建出来的子进程
+                // if (os.platform() === 'linux' && this.goldfishProcess.pid) {
+                //   process.kill(this.goldfishProcess.pid + 1)
+                // }
+                this.killProcess(this.goldfishProcess);
+                yield (0, utils_1.killProcessByCmd)((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.avdName);
+                this.goldfishProcess = undefined;
             }
-            this.killProcess(this.goldfishProcess);
-            this.goldfishProcess = undefined;
-        }
-        if (this.v9fsProcess) {
-            this.killProcess(this.v9fsProcess);
-            this.v9fsProcess = undefined;
-        }
+        });
     }
     /** 重启模拟器 */
     restart() {
-        if (this.goldfishProcess) {
-            this.killProcess(this.goldfishProcess);
-            this.goldfishProcess = undefined;
-        }
+        this.stop();
         this.start(this.startOptions);
     }
     /** 创建server */
@@ -329,4 +291,4 @@ class GoldfishInstance {
         });
     }
 }
-exports.default = GoldfishInstance;
+exports.default = CommonInstance;

package/lib/instance/dev.d.ts

@@ -0,0 +1,15 @@
+import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
+import CommonInstance from './common';
+declare class GoldfishInstance extends CommonInstance {
+    private appRunDir;
+    constructor(params: INewGoldfishInstanceParams);
+    /** 在goldfish模拟器中运行快应用 */
+    start(options: IStartOptions): Promise<void>;
+    /** 在goldfish中启动快应用 */
+    startupQuickApp(options: IStartOptions): Promise<void>;
+    /** 启动goldfish模拟器 */
+    startGoldfish(options: IStartOptions): Promise<void>;
+    /** 将打包后的文件推到挂载的快应用目录 */
+    pushRpk(sourceRoot: string): Promise<void>;
+}
+export default GoldfishInstance;

package/lib/instance/dev.js

@@ -0,0 +1,184 @@
+"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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+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"));
+class GoldfishInstance extends common_1.default {
+    constructor(params) {
+        super(params);
+        this.appRunDir = '/data/app';
+    }
+    /** 在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');
+                yield 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) {
+        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} &`;
+                if (options.devtool) {
+                    vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
+                }
+                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}`);
+            // 端口映射
+            let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
+            if (devtool) {
+                portMappingStr += `,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} ${portMappingStr} ${windowStr} -qemu ${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) => {
+                        if (options.stdoutCallback) {
+                            options.stdoutCallback(data);
+                        }
+                        else {
+                            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) => {
+                        const stderrCb = options.stderrCallback || console.log;
+                        stderrCb(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}`);
+                    if (options.exitCallback) {
+                        options.exitCallback(code);
+                    }
+                });
+            });
+        });
+    }
+    /** 将打包后的文件推到挂载的快应用目录 */
+    pushRpk(sourceRoot) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sn = `127.0.0.1:${this.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`);
+        });
+    }
+}
+exports.default = GoldfishInstance;

package/lib/instance/index.d.ts

@@ -0,0 +1,7 @@
+import { INewGoldfishInstanceParams } from '../typing/Instance';
+import CommonInstance from './common';
+import GoldfishInstance from './dev';
+import MiwearInstance from "./miwear";
+import OldGoldfishInstance from './preDev';
+declare function findInstance(avdName: string, params: INewGoldfishInstanceParams): GoldfishInstance | MiwearInstance | OldGoldfishInstance | undefined;
+export { CommonInstance, GoldfishInstance, MiwearInstance, OldGoldfishInstance, findInstance };

package/lib/instance/index.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findInstance = exports.OldGoldfishInstance = exports.MiwearInstance = exports.GoldfishInstance = exports.CommonInstance = void 0;
+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;
+const dev_1 = __importDefault(require("./dev"));
+exports.GoldfishInstance = dev_1.default;
+const miwear_1 = __importDefault(require("./miwear"));
+exports.MiwearInstance = miwear_1.default;
+const preDev_1 = __importDefault(require("./preDev"));
+exports.OldGoldfishInstance = preDev_1.default;
+function findInstance(avdName, params) {
+    const { sdkHome, avdHome } = params;
+    const { avdImagePath } = new avd_1.default({ sdkHome, avdHome }).getVelaAvdInfo(avdName);
+    if (!avdImagePath) {
+        ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+        return;
+    }
+    if (avdImagePath.includes('release')) {
+        return new miwear_1.default(params);
+    }
+    else if (avdImagePath.match(/0\.0\.2|0\.0\.1/)) {
+        return new preDev_1.default(params);
+    }
+    return new dev_1.default(params);
+}
+exports.findInstance = findInstance;

package/lib/instance/miwear.d.ts

@@ -0,0 +1,27 @@
+import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
+import CommonInstance from './common';
+/**
+ * MiwearInstance
+ * 针对 vela4.0 的镜像
+ */
+declare class MiwearInstance extends CommonInstance {
+    private appPathInEmulator;
+    private debugSocket?;
+    constructor(params: INewGoldfishInstanceParams);
+    /** 在goldfish模拟器中运行快应用 */
+    start(options: IStartOptions): Promise<void>;
+    /** 启动goldfish模拟器 */
+    startGoldfish(options: IStartOptions): Promise<void>;
+    /** 通过adb连接模拟器 */
+    connectGoldfish(): Promise<boolean>;
+    /** 在goldfish中启动快应用 */
+    startupQuickApp(options: IStartOptions): Promise<void>;
+    /** 将快应用安装到应用列表 */
+    installRpkToAppList(rpkPath: string, targetDir: string): Promise<void>;
+    initDebugSocket(): Promise<void> | undefined;
+    /** 通知模拟器更新 */
+    handleUpdate(): Promise<void>;
+    /** 创建server */
+    createWebsockeServer(): Promise<void>;
+}
+export default MiwearInstance;

package/lib/instance/miwear.js

@@ -0,0 +1,308 @@
+"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 JavascriptDefaultCompileOption_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/JavascriptDefaultCompileOption"));
+const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+const adbMiwt = __importStar(require("@miwt/adb"));
+const child_process_1 = require("child_process");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const 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");
+const common_1 = __importDefault(require("./common"));
+/**
+ * MiwearInstance
+ * 针对 vela4.0 的镜像
+ */
+class MiwearInstance extends common_1.default {
+    constructor(params) {
+        super(params);
+        this.appPathInEmulator = '/data/quickapp/app';
+    }
+    /** 在goldfish模拟器中运行快应用 */
+    start(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.startOptions = options;
+            // 启动模拟器
+            yield this.startGoldfish(options);
+            // adb连接模拟器
+            const connected = yield this.connectGoldfish();
+            if (connected) {
+                ColorConsole_1.default.info('### Emulator ### Goldfish emulator connected successfully');
+                if (this.isFirstStart && this.startOptions.serverPort) {
+                    yield this.createWebsockeServer();
+                }
+                this.startupQuickApp(options);
+                this.isFirstStart = false;
+            }
+            else {
+                ColorConsole_1.default.throw('### Emulator ### Failed to connect emulator, please check whether the adb is normal');
+            }
+        });
+    }
+    /** 启动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}`);
+            // 端口映射
+            let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
+            if (devtool) {
+                portMappingStr += `,hostfwd=tcp:127.0.0.1:${this.debugPort}-10.0.2.15:101`;
+            }
+            // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
+            const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.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} \
+-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} ${portMappingStr} ${windowStr} -qemu ${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, _c;
+                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) {
+                    (_c = (_b = this.goldfishProcess) === null || _b === void 0 ? void 0 : _b.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (data) => {
+                        const msg = data.toString();
+                        const stdoutCb = options.stdoutCallback || console.log;
+                        stdoutCb(msg);
+                        if (msg.match(/quickapp_rpk_installer_init | rpk installer init done/)) {
+                            ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
+                            resolve();
+                        }
+                    });
+                }
+                else {
+                    setTimeout(() => {
+                        ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
+                        resolve();
+                    }, 8000);
+                    ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
+                    resolve();
+                }
+            });
+        });
+    }
+    /** 通过adb连接模拟器 */
+    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}`);
+                    yield adbMiwt.execAdbCmdAsync(adbKillCmd);
+                    const adbConnectCmd = `adb connect ${sn}`;
+                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
+                    const str = yield adbMiwt.execAdbCmdAsync(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;
+        });
+    }
+    /** 在goldfish中启动快应用 */
+    startupQuickApp(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { package: appPackageName } = this.projectInfo;
+            const releaseDir = path_1.default.resolve(this.projectPath, JavascriptDefaultCompileOption_1.default.releasePath || 'dist');
+            const files = fs_extra_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`);
+            }
+            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`);
+            }
+            else {
+                adbMiwt.execAdbCmdAsync(`adb -s ${sn} shell rm /data/debugger_ip.cfg`);
+            }
+            this.installRpkToAppList(rpkPath, this.appPathInEmulator);
+        });
+    }
+    /** 将快应用安装到应用列表 */
+    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;
+                const rpkName = path_1.default.basename(rpkPath);
+                // 1. 查询应用是否已经安装，如果安装了，则先卸载
+                const lsCmd = `adb -s ${sn} shell ls ${this.appPathInEmulator}`;
+                const res = yield adbMiwt.execAdbCmdAsync(lsCmd);
+                if (res.includes(packageName)) {
+                    const uninstallCmd = `adb -s ${sn} shell pm uninstall ${packageName}`;
+                    ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${uninstallCmd}`);
+                    adbMiwt.execAdbCmdAsync(uninstallCmd);
+                    // 这里等待2s的作用是等qemu执行完uninstall操作的一系列工作
+                    yield (0, utils_1.sleep)(2000);
+                }
+                // 2. adb push应用的rpk
+                const pushCmd = `adb -s ${sn} push ${rpkPath} ${targetDir}`;
+                ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
+                yield adbMiwt.execAdbCmdAsync(pushCmd);
+                yield (0, utils_1.sleep)(100);
+                // 3. 安装应用
+                const targetPath = `${targetDir}/${rpkName}`;
+                const installCmd = `adb -s ${sn} shell pm install ${targetPath}`;
+                ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
+                adbMiwt.execAdbCmdAsync(installCmd);
+            }
+            catch (e) { }
+        });
+    }
+    initDebugSocket() {
+        if (this.debugSocket) {
+            return Promise.resolve();
+        }
+        this.debugSocket = new ws_1.default(`ws://localhost:${this.debugPort}`);
+        this.debugSocket.onopen = e => {
+            ColorConsole_1.default.info(`### debugSocket connect success`);
+            return Promise.resolve();
+        };
+        this.debugSocket.onerror = (e) => {
+            ColorConsole_1.default.error(`### Emulator ${e.data}`);
+        };
+        this.debugSocket.onclose = (e) => {
+            ColorConsole_1.default.error(`### Emulator debugSocket connect close: ${e.data}`);
+            this.debugSocket = undefined;
+        };
+    }
+    /** 通知模拟器更新 */
+    handleUpdate() {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.initDebugSocket();
+            // 1. 将整包重新推到miwear中（TODO：增量更新）
+            const sn = `127.0.0.1:${this.adbPort}`;
+            const { package: appPackageName } = this.projectInfo;
+            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`);
+            // 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: {} }));
+            }
+        });
+    }
+    /** 创建server */
+    createWebsockeServer() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const wsServer = new ws_1.WebSocketServer({
+                port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort,
+            });
+            wsServer.on('connection', socket => {
+                ColorConsole_1.default.success(`### App Socket server ### Websocket connects to websocket server`);
+                socket.on('error', err => {
+                    ColorConsole_1.default.error(`### App Socket server ### Websocket server error: ${err.message}`);
+                });
+                socket.on('message', (data) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    const message = JSON.parse(data.toString());
+                    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)) {
+                            this.restart();
+                            return;
+                        }
+                        this.handleUpdate();
+                    }
+                    else if (message.type === 'stop') {
+                        this.stop();
+                    }
+                }));
+            });
+        });
+    }
+}
+exports.default = MiwearInstance;

package/lib/instance/{goldfish1.d.ts → preDev.d.ts}

@@ -1,22 +1,11 @@
 /// <reference types="node" />
 import { ChildProcess } from 'child_process';
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
-declare class GoldfishInstance {
-    private projectPath;
-    private sdkHome;
-    private avdHome;
-    private adbPort;
-    debugPort: number;
+import CommonInstance from './common';
+declare class OldGoldfishInstance extends CommonInstance {
     private host9pPort;
-    private velaAvdCls;
-    private packageName;
-    goldfishProcess: ChildProcess | undefined;
     v9fsProcess: ChildProcess | undefined;
-    isFirstStart: boolean;
-    private startOptions;
     constructor(params: INewGoldfishInstanceParams);
-    /** 获取模拟器二进制文件所在位置 */
-    getEmulatorBinPath(): string;
     /** 在goldfish模拟器中运行快应用 */
     start(options: IStartOptions): Promise<void>;
     /** 在goldfish中启动快应用 */
@@ -27,15 +16,8 @@ declare class GoldfishInstance {
     startGoldfish(options: IStartOptions): Promise<void>;
     /** 通过adb连接模拟器 */
     connectGoldfish(): Promise<boolean>;
-    /** 将打包后的文件推到挂载的快应用目录 */
-    pushRpk(): void;
-    /** 杀死进程 */
-    killProcess(currProcess?: ChildProcess): void;
+    pushRpk(sourceRoot: string): Promise<void>;
     /** 停止模拟器并释放相关资源 */
-    stop(): void;
-    /** 重启模拟器 */
-    restart(): void;
-    /** 创建server */
-    createWebsockeServer(): Promise<void>;
+    stop(): Promise<void>;
 }
-export default GoldfishInstance;
+export default OldGoldfishInstance;

package/lib/instance/{goldfish.js → preDev.js}

@@ -35,7 +35,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const UxFileUtils_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/utils/ux/UxFileUtils"));
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
 const adbMiwt = __importStar(require("@miwt/adb"));
@@ -45,33 +44,12 @@ const fs_1 = __importDefault(require("fs"));
 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");
-const utils_1 = require("../utils");
-class GoldfishInstance {
+const common_1 = __importDefault(require("./common"));
+class OldGoldfishInstance extends common_1.default {
     constructor(params) {
-        this.adbPort = 15555;
-        this.debugPort = 10055;
+        super(params);
         this.host9pPort = 7878;
-        this.isFirstStart = true;
-        this.projectPath = params.projectPath;
-        this.sdkHome = params.sdkHome || constants_1.defaultSDKHome;
-        this.avdHome = params.avdHome || constants_1.defaultAvdHome;
-        this.velaAvdCls = new avd_1.default({
-            sdkHome: this.sdkHome,
-            avdHome: this.avdHome
-        });
-        const { package: appPackageName } = UxFileUtils_1.default.getMainfestInfo(this.projectPath, params.sourceRoot);
-        this.packageName = appPackageName;
-    }
-    /** 获取模拟器二进制文件所在位置 */
-    getEmulatorBinPath() {
-        const osPlatform = os_1.default.platform();
-        const arch = (0, utils_1.getSystemArch)();
-        const platform = osPlatform === 'win32' ? 'windows' : osPlatform;
-        const emulatorHome = path_1.default.resolve(this.sdkHome, 'emulator');
-        return path_1.default.resolve(emulatorHome, `${platform}-${arch}`, 'emulator');
     }
     /** 在goldfish模拟器中运行快应用 */
     start(options) {
@@ -79,8 +57,9 @@ class GoldfishInstance {
             // host启动9p server
             yield this.ensure9pServerRunnning();
             this.startOptions = options;
-            // 将rpk推到host的QuickappHome目录
-            this.pushRpk();
+            // 将rpk推到host的./export/qa/app目录
+            const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
+            this.pushRpk(buildedFilesPath);
             // 启动模拟器
             yield this.startGoldfish(options);
             const connected = yield this.connectGoldfish();
@@ -101,13 +80,14 @@ class GoldfishInstance {
     /** 在goldfish中启动快应用 */
     startupQuickApp(options) {
         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`;
             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/${this.packageName} &`;
+            let vappCmd = `adb -s 127.0.0.1:${this.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/${this.packageName} &`;
+                vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
             }
             ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
             // vapp进程会一直pending，不会退出。这里必须加stdio: 'ignore'，否则快应用无法运行成功
@@ -157,7 +137,6 @@ class GoldfishInstance {
     }
     /** 启动goldfish模拟器 */
     startGoldfish(options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { avdName, devtool } = options;
             const emulatorBin = this.getEmulatorBinPath();
@@ -182,9 +161,9 @@ class GoldfishInstance {
             // vnc配置
             let noWindow = false;
             let vncStr = '';
-            if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.vncPort) {
+            if (options.vncPort) {
                 noWindow = true;
-                const portSuffix = this.startOptions.vncPort - constants_1.defaultVncPort;
+                const portSuffix = options.vncPort - constants_1.defaultVncPort;
                 vncStr = `-vnc :${portSuffix}`;
             }
             // 启动goldfish的命令和参数
@@ -211,15 +190,20 @@ class GoldfishInstance {
                 var _a;
                 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) => {
-                    console.log(data.toString());
+                    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);
+                    }
                 });
                 const p1 = new Promise((resolve) => {
                     var _a, _b;
                     (_b = (_a = this.goldfishProcess) === null || _a === void 0 ? void 0 : _a.stdout) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                        console.log(data.toString());
+                        const stdoutCb = options.stdoutCallback || console.log;
+                        stdoutCb(data.toString());
                         if (data.toString().includes('(NSH)')) {
                             ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
                             resolve();
@@ -264,84 +248,28 @@ class GoldfishInstance {
             return adbConnected;
         });
     }
-    /** 将打包后的文件推到挂载的快应用目录 */
-    pushRpk() {
-        const buildDir = path_1.default.resolve(this.projectPath, 'build');
-        const { package: appPackageName } = UxFileUtils_1.default.getMainfestInfo(this.projectPath);
-        const appRunDir = path_1.default.resolve(this.sdkHome, 'qa/app', appPackageName);
-        ColorConsole_1.default.log(`### Emulator ### Pushing ${appPackageName} to ${appRunDir}`);
-        fs_1.default.rmSync(appRunDir, { recursive: true, force: true });
-        FileUtil_1.default.copyFiles(buildDir, appRunDir);
-        ColorConsole_1.default.log(`### Emulator ### Push ${appPackageName} to ${appRunDir} successfully`);
-    }
-    /** 杀死进程 */
-    killProcess(currProcess) {
-        if (currProcess && currProcess.pid && currProcess.exitCode === null) {
-            console.log('process pid:', currProcess.pid);
-            try {
-                if (os_1.default.platform() === 'win32') {
-                    (0, child_process_1.execSync)(`taskkill /pid ${currProcess.pid} /T /F`);
-                }
-                else if (os_1.default.platform() === 'darwin') {
-                    process.kill(currProcess.pid);
-                }
-                else {
-                    currProcess.kill();
-                }
-            }
-            catch (err) {
-                ColorConsole_1.default.log(`### Emulator ### kill process get error :\n${err.stack}`);
-            }
-        }
+    pushRpk(sourceRoot) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { package: appPackageName } = this.projectInfo;
+            const appRunDir = path_1.default.resolve(this.sdkHome, 'qa/app', appPackageName);
+            ColorConsole_1.default.log(`### Emulator ### Pushing ${appPackageName} to ${appRunDir}`);
+            fs_1.default.rmSync(appRunDir, { recursive: true, force: true });
+            FileUtil_1.default.copyFiles(sourceRoot, appRunDir);
+            ColorConsole_1.default.log(`### Emulator ### Push ${appPackageName} to ${appRunDir} successfully`);
+        });
     }
     /** 停止模拟器并释放相关资源 */
     stop() {
-        if (this.goldfishProcess) {
-            // Linux删除goldfishProcess后，子进程仍存在，导致模拟器窗口未关闭
-            // 这里的作用是手动删除创建出来的子进程
-            if (os_1.default.platform() === 'linux' && this.goldfishProcess.pid) {
-                process.kill(this.goldfishProcess.pid + 1);
-            }
-            this.killProcess(this.goldfishProcess);
-            this.goldfishProcess = undefined;
-        }
-        if (this.v9fsProcess) {
-            this.killProcess(this.v9fsProcess);
-            this.v9fsProcess = undefined;
-        }
-    }
-    /** 重启模拟器 */
-    restart() {
-        if (this.goldfishProcess) {
-            this.killProcess(this.goldfishProcess);
-            this.goldfishProcess = undefined;
-        }
-        this.start(this.startOptions);
-    }
-    /** 创建server */
-    createWebsockeServer() {
-        var _a;
+        const _super = Object.create(null, {
+            stop: { get: () => super.stop }
+        });
         return __awaiter(this, void 0, void 0, function* () {
-            const wsServer = new ws_1.WebSocketServer({
-                port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort,
-            });
-            wsServer.on('connection', socket => {
-                ColorConsole_1.default.success(`### App Socket server ### Websocket connects to websocket server`);
-                socket.on('error', err => {
-                    ColorConsole_1.default.error(`### App Socket server ### Websocket server error: ${err.message}`);
-                });
-                socket.on('message', data => {
-                    const message = JSON.parse(data.toString());
-                    ColorConsole_1.default.log(`### App Socket server ### Websocket server get data: ${data}`);
-                    if (message.type === 'restart') {
-                        this.restart();
-                    }
-                    else if (message.type === 'stop') {
-                        this.stop();
-                    }
-                });
-            });
+            _super.stop.call(this);
+            if (this.v9fsProcess) {
+                this.killProcess(this.v9fsProcess);
+                this.v9fsProcess = undefined;
+            }
         });
     }
 }
-exports.default = GoldfishInstance;
+exports.default = OldGoldfishInstance;

package/lib/static/debugger_ip.cfg

@@ -0,0 +1 @@
+10.0.2.15:101

package/lib/typing/Instance.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { IAvdResourcePaths } from "./Avd";
 export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
     projectPath: string;
@@ -9,4 +10,7 @@ export interface IStartOptions {
     disableNSH?: boolean;
     serverPort?: number;
     vncPort?: number;
+    stdoutCallback?: (buffer: Buffer) => void;
+    stderrCallback?: (buffer: Buffer) => void;
+    exitCallback?: (code: number | null) => void;
 }

package/lib/utils/index.d.ts

@@ -3,3 +3,10 @@
  * 所以15.0.0之前无法通过os.arch()区分，也无法通过execSync('uname -m')区分
  */
 export declare function getSystemArch(): string | void;
+/** 根据PID杀死进程 */
+export declare function killProcessByPid(pid: string): void;
+/**
+ * 根据命令杀死进程
+ */
+export declare function killProcessByCmd(cmd: string): Promise<void>;
+export declare function sleep(time: number): Promise<void>;

package/lib/utils/index.js

@@ -1,11 +1,21 @@
 "use strict";
+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 });
-exports.getSystemArch = void 0;
+exports.sleep = exports.killProcessByCmd = exports.killProcessByPid = exports.getSystemArch = void 0;
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const child_process_1 = require("child_process");
+const find_process_1 = __importDefault(require("find-process"));
 const os_1 = __importDefault(require("os"));
 const semver_1 = __importDefault(require("semver"));
 const cpuArch = {
@@ -37,3 +47,41 @@ function getSystemArch() {
     return cpuArch[osArch];
 }
 exports.getSystemArch = getSystemArch;
+/** 根据PID杀死进程 */
+function killProcessByPid(pid) {
+    try {
+        const cmd = os_1.default.platform() === "win32"
+            ? `taskkill /pid ${pid} /T /F`
+            : `kill -9 ${pid}`;
+        (0, child_process_1.execSync)(cmd);
+    }
+    catch (e) {
+        console.error(`kill process ${pid} get error: ${e}`);
+    }
+}
+exports.killProcessByPid = killProcessByPid;
+/**
+ * 根据命令杀死进程
+ */
+function killProcessByCmd(cmd) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!cmd)
+            return;
+        try {
+            const list = yield (0, find_process_1.default)('name', cmd);
+            list.forEach((item) => __awaiter(this, void 0, void 0, function* () {
+                killProcessByPid(item.pid.toString());
+            }));
+        }
+        catch (e) {
+            console.error(`kill process ${cmd} get error: ${e}`);
+        }
+    });
+}
+exports.killProcessByCmd = killProcessByCmd;
+function sleep(time) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise(resolve => setTimeout(resolve, time));
+    });
+}
+exports.sleep = sleep;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-dev.3",
+  "version": "2.0.2-dev.5",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,10 +35,10 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-dev.3",
-    "@aiot-toolkit/shared-utils": "2.0.2-dev.3",
+    "@aiot-toolkit/aiotpack": "2.0.2-dev.5",
+    "@aiot-toolkit/shared-utils": "2.0.2-dev.5",
     "find-process": "^1.4.7",
     "portfinder": "^1.0.32"
   },
-  "gitHead": "e143a7038d5efaa59f01b2e2eb98422b1ec01097"
+  "gitHead": "0c123fdd458966a4ca438cca03cc9efc2b5f634c"
 }