@aiot-toolkit/emulator 2.0.2-beta.10 → 2.0.2-beta.12

package/lib/instance/miwear.js

@@ -35,14 +35,13 @@ 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 shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const adbMiwt = __importStar(require("@miwt/adb"));
 const child_process_1 = require("child_process");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const ws_1 = __importStar(require("ws"));
-const constants_1 = require("../static/constants");
 const utils_1 = require("../utils");
 const common_1 = __importDefault(require("./common"));
 const dayjs_1 = __importDefault(require("dayjs"));
@@ -55,8 +54,10 @@ class MiwearInstance extends common_1.default {
     constructor(params) {
         super(params);
         this.params = params;
+        this.quickappStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
         this.appPathInEmulator = '/data/quickapp/app';
         this.reconnectCount = 0;
+        this.emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
     }
     /**
      * 1. 启动模拟器
@@ -66,13 +67,13 @@ class MiwearInstance extends common_1.default {
     start(options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.startOptions = options;
-            this.sn = `127.0.0.1:${this.startOptions.adbPort}`;
+            this.sn = `emulator-${this.startOptions.adbPort}`;
             // 启动模拟器
             yield this.startGoldfish(options);
             // adb连接模拟器
-            const connected = yield this.connectGoldfish(120);
+            const connected = yield this.isConnected();
             if (connected) {
-                ColorConsole_1.default.info('### Emulator ### Goldfish emulator connected successfully');
+                shared_utils_1.ColorConsole.info('### Emulator ### Goldfish emulator connected successfully');
                 // 如果是首次启动，创建server端监听事件
                 if (this.isFirstStart && this.startOptions.serverPort) {
                     yield this.createWebsockeServer();
@@ -83,7 +84,7 @@ class MiwearInstance extends common_1.default {
             }
             else {
                 const msg = '### Emulator ### Failed to connect emulator, please check whether the adb is normal';
-                ColorConsole_1.default.throw(msg);
+                shared_utils_1.ColorConsole.throw(msg);
                 throw new Error(msg);
             }
         });
@@ -104,20 +105,20 @@ class MiwearInstance extends common_1.default {
             const { avdName, devtool, origin = 'terminal' } = options;
             // 获取emulator bin的绝对路径
             const emulatorBin = this.getEmulatorBinPath();
-            ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+            shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
             // 获取vela镜像的绝对路径
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath } = avdInfo;
-            ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
+            const { avdArch, avdImagePath, customImagePath } = avdInfo;
+            shared_utils_1.ColorConsole.log(`### Emulator ### adb port: ${options.adbPort}`);
             if (!avdImagePath) {
-                return ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+                return shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
             }
-            const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
-            ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
-            // 端口映射，adb端口和debug端口
-            let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
+            const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
+            shared_utils_1.ColorConsole.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
+            // 端口映射
+            let portMappingStr = ``;
             if (devtool) {
-                portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
+                portMappingStr += `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
             }
             // 设备挂载节点
             const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.bin'); // 只读
@@ -145,61 +146,50 @@ class MiwearInstance extends common_1.default {
 -drive index=2,id=vendor,if=none,format=raw,file=${coreBin},read-only \
 -device virtio-blk-device,bus=virtio-mmio-bus.4,drive=vendor \
 -device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
-            // vnc配置
+            // grpc配置
             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}`;
+            let grpcStr = '';
+            if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.grpcPort) {
+                windowStr = '-qt-hide-window';
+                grpcStr = ` -idle-grpc-timeout 300 -grpc ${this.startOptions.grpcPort}`;
             }
             // 启动模拟器的命令和参数
-            const cmd = `${emulatorBin} -nuttx -avd ${avdName} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} -qemu ${vncStr} ${imageMountStr}`;
+            const cmd = `${emulatorBin} -nuttx -avd ${avdName} -port ${options.adbPort} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} ${grpcStr} -qemu ${imageMountStr}`;
             const spawnArgs = cmd.split(' ');
             const spawnBin = spawnArgs.shift();
-            ColorConsole_1.default.log(`### Emulator ### Start CMD: ${cmd}`);
+            shared_utils_1.ColorConsole.log(`### Emulator ### Start CMD: ${cmd}`);
             return new Promise((resolve) => {
-                var _a, _b, _c, _d, _e;
+                var _a, _b, _c;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, {
                     stdio: 'pipe',
                     shell: true,
                     cwd: this.sdkHome
                 });
-                // 处理origin为terminal
-                if (origin === 'terminal') {
-                    process.stdout.pipe(this.goldfishProcess.stdin);
-                    (_a = this.goldfishProcess.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
-                    (_b = this.goldfishProcess.stderr) === null || _b === void 0 ? void 0 : _b.pipe(process.stderr);
-                }
                 // 监听模拟器的退出事件
                 this.goldfishProcess.on('exit', (code) => {
-                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+                    shared_utils_1.ColorConsole.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
                     if (options.exitCallback) {
                         options.exitCallback(code);
                     }
                 });
                 // 监听错误流
-                if (origin === 'ide') {
-                    (_c = this.goldfishProcess.stderr) === null || _c === void 0 ? void 0 : _c.on('data', (data) => {
-                        const stderrCb = options.stderrCallback || console.log;
-                        stderrCb(data.toString());
-                    });
-                }
+                (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+                    const stderrCb = options.stderrCallback || console.log;
+                    stderrCb(data.toString());
+                });
                 // 监听输出流
-                (_e = (_d = this.goldfishProcess) === null || _d === void 0 ? void 0 : _d.stdout) === null || _e === void 0 ? void 0 : _e.on('data', (data) => {
+                (_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();
-                    if (origin === 'ide') {
-                        const stdoutCb = options.stdoutCallback || console.log;
-                        stdoutCb(msg);
-                        // 应用安装成功，则启动它
-                        // if (msg.match(/InstallState_Finished|install finished/)) {
-                        //   ColorConsole.info(`### Emulator ### Install quickapp successfully`)
-                        //   this.launchQuickapp()
-                        // }
+                    const stdoutCb = options.stdoutCallback || console.log;
+                    stdoutCb(msg);
+                    // 应用安装成功，则启动它
+                    if (msg.match(/InstallState_Finished|install finished/)) {
+                        shared_utils_1.ColorConsole.info(`### Emulator ### Install quickapp successfully`);
+                        this.launchQuickapp();
                     }
                     // 匹配到，则认为模拟器启动成功
-                    if (msg.match(/quickapp_rpk_installer_init|rpk installer init done/)) {
-                        ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
+                    if (msg.match(this.emulatorStartedFlag)) {
+                        shared_utils_1.ColorConsole.info(`### Emulator ### Goldfish emulator starts successfully`);
                         resolve();
                     }
                 });
@@ -226,7 +216,7 @@ class MiwearInstance extends common_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`);
+                shared_utils_1.ColorConsole.error(`### Emulator the rpk does not exist`);
             }
             const rpkPath = path_1.default.resolve(releaseDir, files[0]);
             // 调试模式需要push一个文件至miwear中
@@ -235,7 +225,7 @@ class MiwearInstance extends common_1.default {
                 yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} push ${debuggerCfgFile} /data/debugger_ip.cfg`);
             }
             else {
-                adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell rm /data/debugger_ip.cfg`);
+                yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell rm /data/debugger_ip.cfg`);
             }
             this.installRpkToAppList(rpkPath, this.appPathInEmulator);
         });
@@ -249,39 +239,15 @@ class MiwearInstance extends common_1.default {
      */
     installRpkToAppList(rpkPath, targetDir) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const { package: packageName } = this.projectInfo;
-                // 1. adb push应用的rpk
-                const targetPath = `${targetDir}/${packageName}.rpk`;
-                const pushCmd = `adb -s ${this.sn} push "${rpkPath}" ${targetPath}`;
-                ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
-                yield adbMiwt.execAdbCmdAsync(pushCmd);
-                yield (0, utils_1.sleep)(1000);
-                // 2. 安装应用(pm install时如何应用重名会覆盖)
-                const installCmd = `adb -s ${this.sn} shell pm install ${targetPath}`;
-                ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${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}`);
-            }
+            const { package: packageName } = this.projectInfo;
+            // 1. adb push应用的rpk
+            const targetPath = `${targetDir}/${packageName}.rpk`;
+            const pushCmd = `adb -s ${this.sn} push "${rpkPath}" ${targetPath}`;
+            shared_utils_1.ColorConsole.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
+            yield adbMiwt.execAdbCmdAsync(pushCmd);
+            const installCmd = `adb -s ${this.sn} shell pm install ${targetPath}`;
+            shared_utils_1.ColorConsole.info(`### Emulator ### Excuting cmd: ${installCmd}`);
+            yield adbMiwt.execAdbCmdAsync(installCmd);
         });
     }
     /** 使用am start启动快应用 */
@@ -289,7 +255,7 @@ class MiwearInstance extends common_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const { package: packageName } = this.projectInfo;
             const startCmd = `adb -s ${this.sn} shell am start ${packageName}`;
-            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${startCmd}`);
+            shared_utils_1.ColorConsole.info(`### Emulator ### Excuting cmd: ${startCmd}`);
             adbMiwt.execAdbCmdAsync(startCmd);
         });
     }
@@ -305,7 +271,7 @@ class MiwearInstance extends common_1.default {
             }
             this.debugSocket = new ws_1.default(`ws://localhost:${(_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.debugPort}`);
             this.debugSocket.onopen = () => {
-                ColorConsole_1.default.info(`### Emulator debugSocket connect success`);
+                shared_utils_1.ColorConsole.info(`### Emulator debugSocket connect success`);
                 return resolve();
             };
             this.debugSocket.onerror = (errorEvent) => {
@@ -313,7 +279,7 @@ class MiwearInstance extends common_1.default {
                 // 重连机制
                 (_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.terminate();
                 if (this.reconnectCount < MAX_RECONNECT_COUNT) {
-                    ColorConsole_1.default.info(`### Emulator the ${this.reconnectCount + 1}th time to reconnect debug server`);
+                    shared_utils_1.ColorConsole.info(`### Emulator the ${this.reconnectCount + 1}th time to reconnect debug server`);
                     this.reconnectCount++;
                     setTimeout(() => this.initDebugSocket(), 2000);
                 }
@@ -326,7 +292,7 @@ class MiwearInstance extends common_1.default {
             this.debugSocket.onclose = (closeEvent) => {
                 this.debugSocket = undefined;
                 this.reconnectCount = 0;
-                ColorConsole_1.default.log(`### Emulator debugSocket connect close: ${closeEvent.reason}`);
+                shared_utils_1.ColorConsole.log(`### Emulator debugSocket connect close: ${closeEvent.reason}`);
             };
         });
     }
@@ -349,7 +315,7 @@ class MiwearInstance extends common_1.default {
                 }
             }
             catch (e) {
-                ColorConsole_1.default.error(`${e}`);
+                shared_utils_1.ColorConsole.error(`${e}`);
             }
         });
     }
@@ -370,7 +336,7 @@ class MiwearInstance extends common_1.default {
                 const sourcePath = path_1.default.resolve(this.projectPath, './build/*');
                 yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} push ${sourcePath} ${this.appPathInEmulator}/${appPackageName}`);
             }
-            ColorConsole_1.default.info(`### Emulator push to ${this.appPathInEmulator}/${appPackageName} successfully`);
+            shared_utils_1.ColorConsole.info(`### Emulator push to ${this.appPathInEmulator}/${appPackageName} successfully`);
         });
     }
     /** 在模拟器中重启快应用（基于am命令，需要保证镜像中已经有am功能）
@@ -378,24 +344,29 @@ class MiwearInstance extends common_1.default {
      * 2. nsh中执行am stop命令退出快应用
      * 3. nsh中执行am start命令启动快应用
      */
+    pushAndReloadApp() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 1. 将整包重新推到miwear中（TODO：增量更新）
+            yield this.pushBuild();
+            yield this.reloadApp();
+        });
+    }
     reloadApp() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                // 1. 将整包重新推到miwear中（TODO：增量更新）
                 const { package: appPackageName } = this.projectInfo;
-                yield this.pushBuild();
                 // 2. 执行am stop和am start命令
                 const stopCmd = `adb -s ${this.sn} shell am stop ${appPackageName}`;
                 yield adbMiwt.execAdbCmdAsync(stopCmd);
-                ColorConsole_1.default.info(`### Emulator stop ${appPackageName} successfully`);
+                shared_utils_1.ColorConsole.info(`### Emulator stop ${appPackageName} successfully`);
                 // 这里是为了等am stop命令清除资源等
                 yield (0, utils_1.sleep)(500);
                 const startCmd = `adb -s ${this.sn} shell am start ${appPackageName}`;
                 yield adbMiwt.execAdbCmdAsync(startCmd);
-                ColorConsole_1.default.info(`### Emulator start ${appPackageName} successfully`);
+                shared_utils_1.ColorConsole.info(`### Emulator start ${appPackageName} successfully`);
             }
             catch (e) {
-                ColorConsole_1.default.error(`${e}`);
+                shared_utils_1.ColorConsole.error(`${e}`);
             }
         });
     }
@@ -409,15 +380,15 @@ class MiwearInstance extends common_1.default {
                 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`);
+                shared_utils_1.ColorConsole.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}`);
+                    shared_utils_1.ColorConsole.error(`### App Socket server ### Websocket server error: ${err.message}`);
                 });
                 // data的格式：{ type: string, data: any }
                 socket.on('message', (data) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
                     const message = JSON.parse(data.toString());
-                    ColorConsole_1.default.log(`### App Socket server ### Websocket server get data: ${data}`);
+                    shared_utils_1.ColorConsole.log(`### App Socket server ### Websocket server get data: ${data}`);
                     if (message.type === 'restart') {
                         // 非调试模式下无法热更新
                         if (!((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.devtool)) {

package/lib/instance/pre.d.ts

@@ -0,0 +1,8 @@
+import GoldfishInstance from './dev';
+/**
+ * 不带 miwear 的 4.0 镜像
+ */
+declare class PreInstance extends GoldfishInstance {
+    appRunDir: string;
+}
+export default PreInstance;

package/lib/instance/pre.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const dev_1 = __importDefault(require("./dev"));
+const miwear_1 = __importDefault(require("./miwear"));
+/**
+ * 不带 miwear 的 4.0 镜像
+ */
+class PreInstance extends dev_1.default {
+    constructor() {
+        super(...arguments);
+        this.appRunDir = '/data/quickapp/app';
+    }
+}
+//  pre 镜像的 启动 方式与 MiwearInstance 一致
+PreInstance.prototype.startGoldfish = miwear_1.default.prototype.startGoldfish;
+exports.default = PreInstance;

package/lib/instance/preDev.js

@@ -35,8 +35,7 @@ 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 FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const adbMiwt = __importStar(require("@miwt/adb"));
 const child_process_1 = require("child_process");
 const find_process_1 = __importDefault(require("find-process"));
@@ -78,7 +77,7 @@ class OldGoldfishInstance extends common_1.default {
             // adb连接快应用
             const connected = yield this.connectGoldfish();
             if (connected) {
-                ColorConsole_1.default.log('### Emulator ### Goldfish emulator connected successfully');
+                shared_utils_1.ColorConsole.log('### Emulator ### Goldfish emulator connected successfully');
                 // 如果是首次启动，创建server端监听事件
                 if (this.isFirstStart && this.startOptions.serverPort) {
                     yield this.createWebsockeServer();
@@ -88,7 +87,7 @@ class OldGoldfishInstance extends common_1.default {
                 this.isFirstStart = false;
             }
             else {
-                ColorConsole_1.default.throw('### Emulator ### Failed to connect emulator, please check whether the adb is normal');
+                shared_utils_1.ColorConsole.throw('### Emulator ### Failed to connect emulator, please check whether the adb is normal');
             }
         });
     }
@@ -103,19 +102,19 @@ class OldGoldfishInstance extends common_1.default {
             const { package: packageName } = this.projectInfo;
             const appMountDir = path_1.default.resolve(this.sdkHome, 'qa');
             const mountCmd = `adb -s 127.0.0.1:${options.adbPort} shell mount -t v9fs -o tag=10.0.2.2,port=${this.host9pPort},aname=${appMountDir} /data`;
-            ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${mountCmd}`);
+            shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${mountCmd}`);
             adbMiwt.execAdbCmdSync(mountCmd);
             let vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp app/${packageName} &`;
             // 调试情况下，需要加--jsdebugger=10.0.2.15:101
             if (options.devtool) {
                 vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
             }
-            ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
+            shared_utils_1.ColorConsole.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}`);
+            shared_utils_1.ColorConsole.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
         }
     }
     /** host启动9pServer
@@ -127,10 +126,10 @@ class OldGoldfishInstance extends common_1.default {
             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');
+                shared_utils_1.ColorConsole.log('### Emulator ### 9p server started in host');
                 return resolve();
             }
-            ColorConsole_1.default.log('### Emulator ### Starting 9p server in host');
+            shared_utils_1.ColorConsole.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);
@@ -148,14 +147,14 @@ class OldGoldfishInstance extends common_1.default {
             (_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');
+                    shared_utils_1.ColorConsole.log(output);
+                    shared_utils_1.ColorConsole.log('### Emulator ### 9p server starts successfully');
                     return resolve();
                 }
             });
             // 监听exit事件，判断9p server是否退出了
             this.v9fsProcess.on('exit', (code) => {
-                ColorConsole_1.default.error(`### Emulator ### ya-vm-file-server exited with code ${code}`);
+                shared_utils_1.ColorConsole.error(`### Emulator ### ya-vm-file-server exited with code ${code}`);
                 return reject();
             });
         }));
@@ -175,29 +174,29 @@ class OldGoldfishInstance extends common_1.default {
             const { avdName, devtool, origin = 'terminal' } = options;
             // 获取emulator bin的绝对路径
             const emulatorBin = this.getEmulatorBinPath();
-            ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+            shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
             // 获取vela镜像的绝对路径
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath } = avdInfo;
-            ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
+            const { avdArch, avdImagePath, customImagePath } = avdInfo;
+            shared_utils_1.ColorConsole.log(`### Emulator ### adb port: ${options.adbPort}`);
             if (!avdImagePath) {
-                return ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
+                return shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
             }
-            const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
-            ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
+            const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
+            shared_utils_1.ColorConsole.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
             // 端口映射，adb端口和debug端口
             let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
             if (devtool) {
-                ColorConsole_1.default.log(`### Emulator ### debug port: ${options.debugPort}`);
+                shared_utils_1.ColorConsole.log(`### Emulator ### debug port: ${options.debugPort}`);
                 portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
             }
-            ColorConsole_1.default.log(`### Emulator ### Start qemu with TCP: ${portMappingStr}`);
+            shared_utils_1.ColorConsole.log(`### Emulator ### Start qemu with TCP: ${portMappingStr}`);
             // vnc配置
             let noWindow = false;
             let vncStr = '';
-            if (options.vncPort) {
+            if (options.grpcPort) {
                 noWindow = true;
-                const portSuffix = options.vncPort - constants_1.defaultVncPort;
+                const portSuffix = options.grpcPort - constants_1.defaultVncPort;
                 vncStr = `-vnc :${portSuffix}`;
             }
             // 启动goldfish的命令和参数
@@ -219,7 +218,7 @@ class OldGoldfishInstance extends common_1.default {
                 '-device',
                 'virtio-net-device,netdev=u1,bus=virtio-mmio-bus.3'
             ];
-            ColorConsole_1.default.log(`### Emulator ### Start CMD: ${spawnBin} ${spawnArgs.join(' ')}`);
+            shared_utils_1.ColorConsole.log(`### Emulator ### Start CMD: ${spawnBin} ${spawnArgs.join(' ')}`);
             return new Promise((resolve) => {
                 var _a, _b, _c, _d;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: 'pipe', shell: true });
@@ -234,7 +233,7 @@ class OldGoldfishInstance extends common_1.default {
                 }
                 // 监听模拟器的退出事件
                 this.goldfishProcess.on('exit', (code) => {
-                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+                    shared_utils_1.ColorConsole.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
                     if (options.exitCallback) {
                         options.exitCallback(code);
                     }
@@ -247,7 +246,7 @@ class OldGoldfishInstance extends common_1.default {
                         stdoutCb(msg);
                     }
                     if (msg.includes('(NSH)')) {
-                        ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
+                        shared_utils_1.ColorConsole.log(`### Emulator ### Goldfish emulator starts successfully`);
                         resolve();
                     }
                 });
@@ -262,10 +261,10 @@ class OldGoldfishInstance extends common_1.default {
         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}`);
+            shared_utils_1.ColorConsole.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`);
+            shared_utils_1.FileUtil.copyFiles(sourceRoot, appRunDir);
+            shared_utils_1.ColorConsole.log(`### Emulator ### Push ${appPackageName} to ${appRunDir} successfully`);
         });
     }
     /** 停止模拟器并释放相关资源 */

package/lib/static/avdConfigIni.json

@@ -10,8 +10,8 @@
   "hw.arc": false,
   "hw.audioInput": "yes",
   "hw.battery": "yes",
-  "hw.camera.back": "virtualscene",
-  "hw.camera.front": "emulated",
+  "hw.camera.back": "None",
+  "hw.camera.front": "None",
   "hw.cpu.arch": "arm",
   "hw.cpu.ncore": 4,
   "hw.dPad": "no",
@@ -36,4 +36,4 @@
   "skin.dynamic": "no",
   "skin.name": "",
   "skin.path": ""
-}
+}

package/lib/static/constants.d.ts

@@ -8,10 +8,17 @@ export declare const defaultToolsHome: string;
 export declare const defaultVncPort = 5900;
 export declare const defaultAdbPort = 5555;
 export declare const defaultDebugPort = 10055;
+/**
+ * vela-release-4.0 ： vela 4.0 带 miwear
+ * vela-pre-4.0     ： vela 4.0 不带 miwear
+ * vela-dev-0.0.4   ： vela 4.0 dev 分支
+ */
 export declare const VelaImageVersionList: {
     label: string;
     value: string;
     time: string;
+    hide: boolean;
+    icon: null;
 }[];
 export declare const EmulatorEnvVersion: {
     name: string;

package/lib/static/constants.js

@@ -16,21 +16,45 @@ exports.defaultToolsHome = path_1.default.resolve(exports.defaultSDKHome, 'tools
 exports.defaultVncPort = 5900;
 exports.defaultAdbPort = 5555;
 exports.defaultDebugPort = 10055;
+// 不确定vela镜像的发布策略，暂时需要手动更新此列表
+// 0.0.2和0.0.3版本比较特殊，线上是一个nuttx文件。其他版本都是一个zip包，包含nuttx data.img和vela_source.img
+/**
+ * vela-release-4.0 ： vela 4.0 带 miwear
+ * vela-pre-4.0     ： vela 4.0 不带 miwear
+ * vela-dev-0.0.4   ： vela 4.0 dev 分支
+ */
 exports.VelaImageVersionList = [
     {
-        label: 'vela正式版（4.0）',
+        label: 'vela-4.0-正式版',
         value: 'vela-release-4.0',
-        time: '2024-04-10T04:10:00'
+        time: '2024-07-15T15:57:00',
+        hide: false,
+        icon: null
     },
     {
-        label: 'vela开发版（dev, 0.0.2）',
-        value: 'vela-dev-0.0.2',
-        time: '2023-12-04T16:31:00',
+        label: 'vela-4.0-测试版',
+        value: 'vela-pre-4.0',
+        time: '2024-07-151T07:07:00',
+        hide: false,
+        icon: null
     },
+    //  废弃 0.0.2 版本
+    // {
+    //   label: 'vela开发版（dev, 0.0.2）',
+    //   value: 'vela-dev-0.0.2',
+    //   time: '2023-12-04T16:31:00',
+    // },
+    {
+        label: 'vela-dev-开发版',
+        value: 'vela-dev-0.0.4',
+        time: '2024-07-12T11:12:00',
+        hide: true,
+        icon: null
+    }
 ];
 exports.EmulatorEnvVersion = {
     name: '模拟器资源版本管理',
-    emulator: '0.0.3',
+    emulator: '0.0.4',
     qa: '0.0.1',
     skins: '0.0.1',
     'system-images': exports.VelaImageVersionList[0].value,

package/lib/typing/Avd.d.ts

@@ -14,6 +14,7 @@ export interface IAvdParams {
     avdHeight: string;
     avdSkin?: string;
     avdImagePath?: string;
+    customImagePath?: string;
 }
 export interface ISkinInfo {
     skinName: string;