@aiot-toolkit/emulator 2.0.2-beta.7 → 2.0.2-beta.9

package/lib/instance/common.d.ts

@@ -16,6 +16,7 @@ declare class CommonInstance {
     startOptions: IStartOptions | undefined;
     projectInfo: IManifest;
     isRpk: boolean;
+    isDistributedApp: boolean;
     sn?: string;
     constructor(params: INewGoldfishInstanceParams);
     /** 获取模拟器二进制文件所在位置 */
@@ -24,10 +25,10 @@ declare class CommonInstance {
     start(options: IStartOptions): Promise<void>;
     /**
      * 通过adb连接模拟器。
-     * 时间限制为10s，超时则表示连接失败
+     * 时间限制为 @param timeout 秒，超时则表示连接失败
      * @returns
      */
-    connectGoldfish(): Promise<unknown>;
+    connectGoldfish(timeout?: number): Promise<unknown>;
     /** 杀死进程 */
     killProcess(currProcess?: ChildProcess): void;
     /** 停止模拟器并释放相关资源 */
@@ -36,5 +37,6 @@ declare class CommonInstance {
     restart(): Promise<void>;
     /** 创建server */
     createWebsockeServer(): Promise<void>;
+    connectDevice(): Promise<string | void>;
 }
 export default CommonInstance;

package/lib/instance/common.js

@@ -45,16 +45,24 @@ const ws_1 = require("ws");
 const avd_1 = __importDefault(require("../avd"));
 const constants_1 = require("../static/constants");
 const utils_1 = require("../utils");
+const fs_extra_1 = __importDefault(require("fs-extra"));
 /**
  * CommonInstance
  */
 class CommonInstance {
     constructor(params) {
         this.isFirstStart = true;
+        this.isDistributedApp = false;
         this.projectPath = params.projectPath;
         this.sdkHome = params.sdkHome || constants_1.defaultSDKHome;
         this.avdHome = params.avdHome || constants_1.defaultAvdHome;
         this.isRpk = params.sourceRoot === './';
+        const projectJsonFile = path_1.default.resolve(this.projectPath, '.project.json');
+        const projectJsonExist = fs_extra_1.default.existsSync(projectJsonFile);
+        if (projectJsonExist) {
+            const projectJsonInfo = fs_extra_1.default.readJSONSync(projectJsonFile);
+            this.isDistributedApp = projectJsonInfo.projectType === 'distributed';
+        }
         this.velaAvdCls = new avd_1.default({
             sdkHome: this.sdkHome,
             avdHome: this.avdHome
@@ -75,26 +83,30 @@ class CommonInstance {
     }
     /**
      * 通过adb连接模拟器。
-     * 时间限制为10s，超时则表示连接失败
+     * 时间限制为 @param timeout 秒，超时则表示连接失败
      * @returns
      */
-    connectGoldfish() {
+    connectGoldfish(timeout = 10) {
         return __awaiter(this, void 0, void 0, function* () {
             let adbConnected = false; // adb是否连接成功
             let enableLoop = true; // 是否允许循环，用于终止adb的连接
+            let needKill = false;
             const connectFn = () => __awaiter(this, void 0, void 0, function* () {
                 while (enableLoop && !adbConnected) {
-                    const adbKillCmd = `adb kill-server`;
-                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
-                    adbMiwt.execAdbCmdSync(adbKillCmd);
-                    const adbConnectCmd = `adb connect ${this.sn}`;
-                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
-                    const str = adbMiwt.execAdbCmdSync(adbConnectCmd);
+                    if (needKill) {
+                        const adbKillCmd = `adb kill-server`;
+                        ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
+                        yield adbMiwt.execAdbCmdAsync(adbKillCmd);
+                    }
+                    const str = yield this.connectDevice();
                     ColorConsole_1.default.log(`### Emulator ### ${str}`);
+                    // 查询模拟器的状态是否为“device”
                     const devices = yield adbMiwt.getAdbDevices();
                     ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
-                    adbConnected =
-                        devices.filter((item) => item.sn === this.sn && item.status === 'device').length > 0;
+                    const curDev = devices.find((t) => t.sn === this.sn);
+                    if ((curDev === null || curDev === void 0 ? void 0 : curDev.status) === 'offline')
+                        needKill = true;
+                    adbConnected = devices.some((item) => item.sn === this.sn && item.status === 'device');
                 }
                 return Promise.resolve(adbConnected);
             });
@@ -102,10 +114,12 @@ class CommonInstance {
                 connectFn(),
                 new Promise((resolve) => {
                     setTimeout(() => {
-                        enableLoop = false;
+                        if (!adbConnected) {
+                            enableLoop = false;
+                        }
                         // 超时则认为adb没有连接成功
                         resolve(false);
-                    }, 10 * 1000);
+                    }, timeout * 1000);
                 })
             ]);
             return res;
@@ -162,14 +176,14 @@ class CommonInstance {
         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,
+                port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort
             });
-            wsServer.on('connection', socket => {
+            wsServer.on('connection', (socket) => {
                 ColorConsole_1.default.success(`### App Socket server ### Websocket connects to websocket server`);
-                socket.on('error', err => {
+                socket.on('error', (err) => {
                     ColorConsole_1.default.error(`### App Socket server ### Websocket server error: ${err.message}`);
                 });
-                socket.on('message', data => {
+                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') {
@@ -182,5 +196,32 @@ class CommonInstance {
             });
         });
     }
+    connectDevice() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const adbConnectCmd = `adb connect ${this.sn}`;
+            ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
+            let pending = true;
+            const p1 = adbMiwt.execAdbCmdAsync(adbConnectCmd);
+            let timer;
+            // 超过一定时间还没有连接成功，则 kill-server 后再试
+            // 用于处理 adb connect 一直 pending 的情况
+            const p2 = new Promise((resolve, reject) => {
+                timer = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                    if (pending) {
+                        const adbKillCmd = `adb kill-server`;
+                        ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
+                        yield adbMiwt.execAdbCmdAsync(adbKillCmd);
+                    }
+                    resolve();
+                }), 10 * 1000);
+            });
+            p1.then((r) => {
+                pending = false;
+                clearTimeout(timer);
+                console.log(r);
+            });
+            return Promise.race([p1, p2]);
+        });
+    }
 }
 exports.default = CommonInstance;

package/lib/instance/dev.js

@@ -58,21 +58,28 @@ class GoldfishInstance extends common_1.default {
             this.sn = `127.0.0.1:${this.startOptions.adbPort}`;
             // 启动模拟器
             yield this.startGoldfish(options);
-            const connected = yield this.connectGoldfish();
+            const connected = yield this.connectGoldfish(120);
             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');
+                // aspect应用后续要考虑各种形状表盘的推包
+                const buildedFilesPath = this.isRpk
+                    ? this.projectPath
+                    : this.isDistributedApp
+                        ? path_1.default.resolve(this.projectPath, './build', `${this.projectInfo.package}.watch`)
+                        : 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');
+                const msg = '### Emulator ### Failed to connect emulator, please check whether the adb is normal';
+                ColorConsole_1.default.throw(msg);
+                throw new Error(msg);
             }
         });
     }
@@ -111,7 +118,7 @@ class GoldfishInstance extends common_1.default {
     startGoldfish(options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { avdName, devtool } = options;
+            const { avdName, devtool, origin = 'terminal' } = options;
             const emulatorBin = this.getEmulatorBinPath();
             ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
@@ -143,42 +150,39 @@ class GoldfishInstance extends common_1.default {
                 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 });
+                var _a, _b, _c;
+                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: 'pipe', shell: true });
                 (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                     const stderrCb = options.stderrCallback || console.log;
                     stderrCb(data.toString());
                 });
+                if (origin === 'terminal') {
+                    process.stdout.pipe(this.goldfishProcess.stdin);
+                    (_b = this.goldfishProcess.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
+                }
                 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) {
-                    (_b = this.goldfishProcess.stdout) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                        const msg = data.toString();
+                (_c = this.goldfishProcess.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (data) => {
+                    const msg = data.toString();
+                    if (origin === 'ide') {
                         const stdoutCb = options.stdoutCallback || console.log;
                         stdoutCb(msg);
-                        if (data.toString().includes('(NSH)')) {
-                            ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
-                            resolve();
-                        }
-                    });
-                }
-                else {
-                    setTimeout(() => {
+                    }
+                    if (msg.includes('(NSH)')) {
                         ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
                         resolve();
-                    }, 2000);
-                }
+                    }
+                });
             });
         });
     }
@@ -201,7 +205,7 @@ class GoldfishInstance extends common_1.default {
                 // 支持通配符处理: 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}`);
+                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

@@ -27,14 +27,6 @@ declare class MiwearInstance extends CommonInstance {
      * @returns
      */
     startGoldfish(options: IStartOptions): Promise<void>;
-    /**
-     * 通过adb连接模拟器。
-     * 时间限制为2分钟，超时则表示连接失败
-     * 注意：两次connect之间不能等待，否则在disableNSH=true且有vncPort的模式下，模拟器启动成功了，但是vnc可能还没连接上
-     *      时间限制不能太短，否则模拟器里面的adbd进程还没初始化成功
-     * @returns
-     */
-    connectGoldfish(): Promise<unknown>;
     /**
      * 在模拟器中启动快应用
      * 1. 检查release目录是否有打包好的rpk
@@ -53,6 +45,8 @@ declare class MiwearInstance extends CommonInstance {
      * @param targetDir 要将rpk放到模拟器的哪个目录下
      */
     installRpkToAppList(rpkPath: string, targetDir: string): Promise<void>;
+    /** 使用am start启动快应用 */
+    launchQuickapp(): Promise<void>;
     /** 连接模拟器中的调试服务，创建debugSocket
      * 主要用于热更新时，通过debugSocket通知调试服务更新页面
      * 设置了重连机制，会重复连接8次
@@ -62,7 +56,7 @@ declare class MiwearInstance extends CommonInstance {
      * 1. 确保已经成功连接模拟器中的调试服务
      * 2. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
      * 3. 发送Page.reload命令给调试服务，通知更新
-    */
+     */
     handleUpdate(): Promise<void>;
     /** 热更新时push目录 */
     pushBuild(): Promise<void>;
@@ -70,7 +64,7 @@ declare class MiwearInstance extends CommonInstance {
      * 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

@@ -70,7 +70,7 @@ class MiwearInstance extends common_1.default {
             // 启动模拟器
             yield this.startGoldfish(options);
             // adb连接模拟器
-            const connected = yield this.connectGoldfish();
+            const connected = yield this.connectGoldfish(120);
             if (connected) {
                 ColorConsole_1.default.info('### Emulator ### Goldfish emulator connected successfully');
                 // 如果是首次启动，创建server端监听事件
@@ -82,7 +82,9 @@ class MiwearInstance extends common_1.default {
                 this.isFirstStart = false;
             }
             else {
-                ColorConsole_1.default.throw('### Emulator ### Failed to connect emulator, please check whether the adb is normal');
+                const msg = '### Emulator ### Failed to connect emulator, please check whether the adb is normal';
+                ColorConsole_1.default.throw(msg);
+                throw new Error(msg);
             }
         });
     }
@@ -99,7 +101,7 @@ class MiwearInstance extends common_1.default {
     startGoldfish(options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { avdName, devtool } = options;
+            const { avdName, devtool, origin = 'terminal' } = options;
             // 获取emulator bin的绝对路径
             const emulatorBin = this.getEmulatorBinPath();
             ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
@@ -151,18 +153,24 @@ class MiwearInstance extends common_1.default {
                 const portSuffix = this.startOptions.vncPort - constants_1.defaultVncPort;
                 vncStr = `-vnc :${portSuffix}`;
             }
-            // 根据disableNSH参数配置stdio
-            const stdioType = options.disableNSH ? 'pipe' : 'inherit';
             // 启动模拟器的命令和参数
             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, cwd: this.sdkHome });
+                var _a, _b, _c, _d;
+                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, {
+                    stdio: 'pipe',
+                    shell: true,
+                    cwd: this.sdkHome
+                });
+                if (origin === 'terminal') {
+                    process.stdout.pipe(this.goldfishProcess.stdin);
+                    (_a = this.goldfishProcess.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
+                }
                 // 监听错误流
-                (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+                (_b = this.goldfishProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
                     const stderrCb = options.stderrCallback || console.log;
                     stderrCb(data.toString());
                 });
@@ -173,67 +181,23 @@ class MiwearInstance extends common_1.default {
                         options.exitCallback(code);
                     }
                 });
-                // disableNSH=false时，输出流会直接定向到终端，可在终端输入「回车」进入模拟器的终端，这种情况下无法拿到stdout中的数据
-                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();
+                (_d = (_c = this.goldfishProcess) === null || _c === void 0 ? void 0 : _c.stdout) === null || _d === void 0 ? void 0 : _d.on('data', (data) => {
+                    const msg = data.toString();
+                    if (origin === 'ide') {
                         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 {
-                    // disableNSH=true时，默认8s后模拟器启动成功
-                    setTimeout(() => {
-                        ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
-                        resolve();
-                    }, 8000);
-                }
-            });
-        });
-    }
-    /**
-     * 通过adb连接模拟器。
-     * 时间限制为2分钟，超时则表示连接失败
-     * 注意：两次connect之间不能等待，否则在disableNSH=true且有vncPort的模式下，模拟器启动成功了，但是vnc可能还没连接上
-     *      时间限制不能太短，否则模拟器里面的adbd进程还没初始化成功
-     * @returns
-     */
-    connectGoldfish() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let adbConnected = false; // adb是否连接成功
-            let enableLoop = true; // 是否允许循环，用于终止adb的连接
-            const connectFn = () => __awaiter(this, void 0, void 0, function* () {
-                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 ${this.sn}`;
-                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
-                    const str = yield adbMiwt.execAdbCmdAsync(adbConnectCmd);
-                    ColorConsole_1.default.log(`### Emulator ### ${str}`);
-                    // 查询模拟器的状态是否为“device”
-                    const devices = yield adbMiwt.getAdbDevices();
-                    ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
-                    adbConnected =
-                        devices.filter((item) => item.sn === this.sn && item.status === 'device').length > 0;
-                }
-                return Promise.resolve(adbConnected);
+                        // 应用安装成功，则启动它
+                        // if (msg.match(/InstallState_Finished|install finished/)) {
+                        //   ColorConsole.info(`### Emulator ### Install quickapp successfully`)
+                        //   this.launchQuickapp()
+                        // }
+                    }
+                });
             });
-            const res = yield Promise.race([
-                connectFn(),
-                new Promise((resolve) => {
-                    setTimeout(() => {
-                        enableLoop = false;
-                        // 超时则认为adb没有连接成功
-                        resolve(false);
-                    }, 120 * 1000);
-                })
-            ]);
-            return res;
         });
     }
     /**
@@ -254,7 +218,7 @@ class MiwearInstance extends common_1.default {
                 : path_1.default.resolve(this.projectPath, ((_a = this.params.compilerOption) === null || _a === void 0 ? void 0 : _a.releasePath) || 'dist');
             const files = fs_extra_1.default
                 .readdirSync(releaseDir)
-                .filter(item => item.includes(appPackageName) && item.endsWith('.rpk'));
+                .filter((item) => item.includes(appPackageName) && item.endsWith('.rpk'));
             if (files.length === 0) {
                 ColorConsole_1.default.error(`### Emulator the rpk does not exist`);
             }
@@ -290,13 +254,39 @@ class MiwearInstance extends common_1.default {
                 // 2. 安装应用(pm install时如何应用重名会覆盖)
                 const installCmd = `adb -s ${this.sn} shell pm install ${targetPath}`;
                 ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
-                adbMiwt.execAdbCmdAsync(installCmd);
+                yield adbMiwt.execAdbCmdAsync(installCmd);
+                // 3. 应用安装成功后，启动应用
+                const lsCmd = `adb -s ${this.sn} shell ls ${this.appPathInEmulator}`;
+                let installed = false;
+                let currCount = 0;
+                while (!installed && currCount < 10) {
+                    yield (0, utils_1.sleep)(1000);
+                    const res = yield adbMiwt.execAdbCmdAsync(lsCmd);
+                    // 如果没有上传的rpk了，则表示安装成功
+                    installed = !res.includes(`${packageName}.rpk`);
+                    currCount++;
+                }
+                if (installed) {
+                    this.launchQuickapp();
+                }
+                else {
+                    ColorConsole_1.default.error(`### Emulator ### install ${packageName} failed`);
+                }
             }
             catch (e) {
                 ColorConsole_1.default.error(`### Emulator ### ${e.message}`);
             }
         });
     }
+    /** 使用am start启动快应用 */
+    launchQuickapp() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { package: packageName } = this.projectInfo;
+            const startCmd = `adb -s ${this.sn} shell am start ${packageName}`;
+            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${startCmd}`);
+            adbMiwt.execAdbCmdAsync(startCmd);
+        });
+    }
     /** 连接模拟器中的调试服务，创建debugSocket
      * 主要用于热更新时，通过debugSocket通知调试服务更新页面
      * 设置了重连机制，会重复连接8次
@@ -338,7 +328,7 @@ class MiwearInstance extends common_1.default {
      * 1. 确保已经成功连接模拟器中的调试服务
      * 2. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
      * 3. 发送Page.reload命令给调试服务，通知更新
-    */
+     */
     handleUpdate() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -361,7 +351,7 @@ class MiwearInstance extends common_1.default {
     pushBuild() {
         return __awaiter(this, void 0, void 0, function* () {
             const { package: appPackageName } = this.projectInfo;
-            // windows平台adb push时无法使用通配符，需另外处理; 
+            // 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}`;
@@ -381,7 +371,7 @@ class MiwearInstance extends common_1.default {
      * 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 {
@@ -410,11 +400,11 @@ class MiwearInstance extends common_1.default {
         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,
+                port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort
             });
-            wsServer.on('connection', socket => {
+            wsServer.on('connection', (socket) => {
                 ColorConsole_1.default.success(`### App Socket server ### Websocket connects to websocket server`);
-                socket.on('error', err => {
+                socket.on('error', (err) => {
                     ColorConsole_1.default.error(`### App Socket server ### Websocket server error: ${err.message}`);
                 });
                 // data的格式：{ type: string, data: any }

package/lib/instance/preDev.d.ts

@@ -27,7 +27,7 @@ declare class OldGoldfishInstance extends CommonInstance {
     startupQuickApp(options: IStartOptions): void;
     /** host启动9pServer
      * 作用是将本地的quickappMountDir目录挂载到模拟器的/data目录
-    */
+     */
     ensure9pServerRunnning(): Promise<void>;
     /**
      * 启动模拟器

package/lib/instance/preDev.js

@@ -69,7 +69,9 @@ class OldGoldfishInstance extends common_1.default {
             // host启动9p server
             yield this.ensure9pServerRunnning();
             // 将rpk推到host的./export/qa/app目录
-            const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
+            const buildedFilesPath = this.isRpk
+                ? this.projectPath
+                : path_1.default.resolve(this.projectPath, './build');
             this.pushRpk(buildedFilesPath);
             // 启动模拟器
             yield this.startGoldfish(options);
@@ -118,7 +120,7 @@ class OldGoldfishInstance extends common_1.default {
     }
     /** host启动9pServer
      * 作用是将本地的quickappMountDir目录挂载到模拟器的/data目录
-    */
+     */
     ensure9pServerRunnning() {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -170,7 +172,7 @@ class OldGoldfishInstance extends common_1.default {
      */
     startGoldfish(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { avdName, devtool } = options;
+            const { avdName, devtool, origin = 'terminal' } = options;
             // 获取emulator bin的绝对路径
             const emulatorBin = this.getEmulatorBinPath();
             ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
@@ -198,8 +200,6 @@ class OldGoldfishInstance extends common_1.default {
                 const portSuffix = options.vncPort - constants_1.defaultVncPort;
                 vncStr = `-vnc :${portSuffix}`;
             }
-            // 根据disableNSH参数配置stdio
-            const stdioType = options.disableNSH ? 'pipe' : 'inherit';
             // 启动goldfish的命令和参数
             const spawnBin = emulatorBin;
             const spawnArgs = [
@@ -221,13 +221,17 @@ class OldGoldfishInstance extends common_1.default {
             ];
             ColorConsole_1.default.log(`### Emulator ### Start CMD: ${spawnBin} ${spawnArgs.join(' ')}`);
             return new Promise((resolve) => {
-                var _a;
-                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: stdioType, shell: true });
+                var _a, _b, _c, _d;
+                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: 'pipe', shell: true });
                 // 监听错误流
                 (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                     const stderrCb = options.stderrCallback || console.log;
                     stderrCb(data.toString());
                 });
+                if (origin === 'terminal') {
+                    process.stdout.pipe(this.goldfishProcess.stdin);
+                    (_b = this.goldfishProcess.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
+                }
                 // 监听模拟器的退出事件
                 this.goldfishProcess.on('exit', (code) => {
                     ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
@@ -235,23 +239,18 @@ class OldGoldfishInstance extends common_1.default {
                         options.exitCallback(code);
                     }
                 });
-                // 监听输出流。输出了'(NSH)'标识或者2s后则认为模拟器启动成功
-                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) => {
+                // 监听输出流。输出了'(NSH)'标识后则认为模拟器启动成功
+                (_d = (_c = this.goldfishProcess) === null || _c === void 0 ? void 0 : _c.stdout) === null || _d === void 0 ? void 0 : _d.on('data', (data) => {
+                    const msg = data.toString();
+                    if (origin === 'ide') {
                         const stdoutCb = options.stdoutCallback || console.log;
-                        stdoutCb(data.toString());
-                        if (data.toString().includes('(NSH)')) {
-                            ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
-                            resolve();
-                        }
-                    });
+                        stdoutCb(msg);
+                    }
+                    if (msg.includes('(NSH)')) {
+                        ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
+                        resolve();
+                    }
                 });
-                const p2 = setTimeout(() => {
-                    ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
-                    resolve();
-                }, 2000);
-                return Promise.race([p1, p2]);
             });
         });
     }

package/lib/typing/Instance.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import IJavascriptCompileOption from "@aiot-toolkit/aiotpack/lib/compiler/javascript/interface/IJavascriptCompileOption";
-import { IAvdResourcePaths } from "./Avd";
+import IJavascriptCompileOption from '@aiot-toolkit/aiotpack/lib/compiler/javascript/interface/IJavascriptCompileOption';
+import { IAvdResourcePaths } from './Avd';
 export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
     projectPath: string;
     sourceRoot?: string;
@@ -9,7 +9,9 @@ export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
 export interface IStartOptions {
     avdName: string;
     devtool?: string;
+    /** @deprecated */
     disableNSH?: boolean;
+    origin?: 'ide' | 'terminal';
     serverPort?: number;
     vncPort?: number;
     adbPort: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.7",
+  "version": "2.0.2-beta.9",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,8 +35,8 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.7",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.7",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.9",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.9",
     "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": "dc37f9f6fbef3895d17b54ad41274c66f154f670"
+  "gitHead": "19f19b20ca63800f2403cc89d9a8edb6a102a765"
 }