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

package/lib/avd/index.d.ts

@@ -20,5 +20,9 @@ declare class VelaAvdCls {
     getVelaAvdList(): IAvdParams[];
     /** 获取模拟器皮肤列表 */
     getVelaSkinList(): string[];
+    /** 自定义模拟器的镜像目录 */
+    customImageDir(avdName: string, target: string): void;
+    /** 重置自定义的镜像目录  */
+    resetImageDir(avdName: string): void;
 }
 export default VelaAvdCls;

package/lib/avd/index.js

@@ -3,18 +3,19 @@ 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 fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const ini_1 = require("ini");
 const constants_1 = require("../static/constants");
 const Avd_1 = require("../typing/Avd");
-const os_1 = __importDefault(require("os"));
 const EAvdParamsToIni = {
-    'arm': {
-        abiType: 'armeabi-v7a',
+    arm: {
+        abiType: 'armeabi-v7a'
     },
-    'arm64': {
-        abiType: 'arm64-v8a',
+    arm64: {
+        abiType: 'arm64-v8a'
     }
 };
 class VelaAvdCls {
@@ -72,16 +73,11 @@ class VelaAvdCls {
             // 写入Vela_Virtual_Device.ini文件
             fs_1.default.writeFileSync(avdIni, nuttxAvdIniContent);
             // 写入Vela_Virtual_Device.avd/config.ini文件
-            const fWrite = fs_1.default.createWriteStream(avdConfigIni);
-            for (const item in configIniJson) {
-                const line = `${item} = ${configIniJson[item]}\n`;
-                fWrite.write(line);
-            }
-            fWrite.close();
+            fs_1.default.writeFileSync(avdConfigIni, (0, ini_1.stringify)(configIniJson));
             return true;
         }
         catch (e) {
-            throw (`createVelaAvd: ${e.message}`);
+            throw `createVelaAvd: ${e.message}`;
         }
     }
     /** 根据AVD名字获取模拟器的详细信息 */
@@ -98,26 +94,17 @@ class VelaAvdCls {
         const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
         try {
             const contents = fs_1.default.readFileSync(configIni, 'utf-8');
-            // 这里需要使用惰性匹配
-            const archRegex = /hw.cpu.arch = ([\d\D]+?)\n/;
-            const archMatcher = contents.match(archRegex);
-            const heightRegex = /hw.lcd.height = ([\d\D]+?)\n/;
-            const heightMatcher = contents.match(heightRegex);
-            const widthRegex = /hw.lcd.width = ([\d\D]+?)\n/;
-            const widthMatcher = contents.match(widthRegex);
-            const skinRegex = /skin.name = ([\d\D]+?)\n/;
-            const skinMatcher = contents.match(skinRegex);
-            const imagePathRegex = /image.sysdir.1 = ([\d\D]+?)\n/;
-            const imagePathMather = contents.match(imagePathRegex);
-            archMatcher && (avdInfo.avdArch = archMatcher[1]);
-            heightMatcher && (avdInfo.avdHeight = heightMatcher[1]);
-            widthMatcher && (avdInfo.avdWidth = widthMatcher[1]);
-            skinMatcher && (avdInfo.avdSkin = skinMatcher[1]);
-            imagePathMather && (avdInfo.avdImagePath = imagePathMather[1]);
+            const config = (0, ini_1.parse)(contents);
+            avdInfo.avdArch = config['hw.cpu.arch'];
+            avdInfo.avdHeight = config['hw.lcd.height'];
+            avdInfo.avdWidth = config['hw.lcd.width'];
+            avdInfo.avdSkin = config['skin.name'];
+            avdInfo.avdImagePath = config['image.sysdir.1'];
+            avdInfo.customImagePath = config['image.sysdir.2'];
             return avdInfo;
         }
         catch (err) {
-            ColorConsole_1.default.log(`getVelaAvdInfo: ${err.message}`);
+            shared_utils_1.ColorConsole.log(`getVelaAvdInfo: ${err.message}`);
             return avdInfo;
         }
     }
@@ -164,5 +151,23 @@ class VelaAvdCls {
             return [];
         }
     }
+    /** 自定义模拟器的镜像目录 */
+    customImageDir(avdName, target) {
+        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
+        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
+        const contents = fs_1.default.readFileSync(configIni, 'utf-8');
+        const config = (0, ini_1.parse)(contents);
+        config['image.sysdir.2'] = target;
+        fs_1.default.writeFileSync(configIni, (0, ini_1.stringify)(config));
+    }
+    /** 重置自定义的镜像目录  */
+    resetImageDir(avdName) {
+        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
+        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
+        const contents = fs_1.default.readFileSync(configIni, 'utf-8');
+        const config = (0, ini_1.parse)(contents);
+        delete config['image.sysdir.2'];
+        fs_1.default.writeFileSync(configIni, (0, ini_1.stringify)(config));
+    }
 }
 exports.default = VelaAvdCls;

package/lib/index.d.ts

@@ -1,5 +1,7 @@
 import { default as VelaAvdCls } from './avd';
+import { getSystemArch } from './utils';
 export * from './instance';
 export * from './typing/Avd';
 export * from './typing/Instance';
-export { VelaAvdCls };
+export * from './static/constants';
+export { VelaAvdCls, getSystemArch };

package/lib/index.js

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

package/lib/instance/common.d.ts

@@ -7,6 +7,7 @@ import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
  * CommonInstance
  */
 declare class CommonInstance {
+    quickappStartedFlag: RegExp;
     projectPath: string;
     sdkHome: string;
     avdHome: string;
@@ -23,6 +24,10 @@ declare class CommonInstance {
     getEmulatorBinPath(): string;
     /** 在goldfish模拟器中运行快应用 */
     start(options: IStartOptions): Promise<void>;
+    /**
+     * 判断模拟器是否 ready
+     */
+    isConnected(): Promise<boolean>;
     /**
      * 通过adb连接模拟器。
      * 时间限制为 @param timeout 秒，超时则表示连接失败

package/lib/instance/common.js

@@ -36,21 +36,22 @@ var __importDefault = (this && this.__importDefault) || function (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 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 = 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.quickappStartedFlag = /__loadChunks/;
         this.isFirstStart = true;
         this.isDistributedApp = false;
         this.projectPath = params.projectPath;
@@ -81,6 +82,19 @@ class CommonInstance {
     start(options) {
         return __awaiter(this, void 0, void 0, function* () { });
     }
+    /**
+     * 判断模拟器是否 ready
+     */
+    isConnected() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (0, utils_1.tryRun)(() => __awaiter(this, void 0, void 0, function* () {
+                const devices = yield adbMiwt.getAdbDevices();
+                shared_utils_1.ColorConsole.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
+                const curDev = devices.find((t) => t.sn === this.sn);
+                return (curDev === null || curDev === void 0 ? void 0 : curDev.status) === 'device';
+            }), 10, 500);
+        });
+    }
     /**
      * 通过adb连接模拟器。
      * 时间限制为 @param timeout 秒，超时则表示连接失败
@@ -95,14 +109,14 @@ class CommonInstance {
                 while (enableLoop && !adbConnected) {
                     if (needKill) {
                         const adbKillCmd = `adb kill-server`;
-                        ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
+                        shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
                         yield adbMiwt.execAdbCmdAsync(adbKillCmd);
                     }
                     const str = yield this.connectDevice();
-                    ColorConsole_1.default.log(`### Emulator ### ${str}`);
+                    shared_utils_1.ColorConsole.log(`### Emulator ### ${str}`);
                     // 查询模拟器的状态是否为“device”
                     const devices = yield adbMiwt.getAdbDevices();
-                    ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
+                    shared_utils_1.ColorConsole.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
                     const curDev = devices.find((t) => t.sn === this.sn);
                     if ((curDev === null || curDev === void 0 ? void 0 : curDev.status) === 'offline')
                         needKill = true;
@@ -141,7 +155,7 @@ class CommonInstance {
                 }
             }
             catch (err) {
-                ColorConsole_1.default.log(`### Emulator ### kill process get error :\n${err.stack}`);
+                shared_utils_1.ColorConsole.log(`### Emulator ### kill process get error :\n${err.stack}`);
             }
         }
     }
@@ -179,13 +193,13 @@ class CommonInstance {
                 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}`);
                 });
                 socket.on('message', (data) => {
                     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') {
                         this.restart();
                     }
@@ -199,7 +213,7 @@ 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}`);
+            shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
             let pending = true;
             const p1 = adbMiwt.execAdbCmdAsync(adbConnectCmd);
             let timer;
@@ -209,7 +223,7 @@ class CommonInstance {
                 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}`);
+                        shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
                         yield adbMiwt.execAdbCmdAsync(adbKillCmd);
                     }
                     resolve();

package/lib/instance/dev.d.ts

@@ -1,7 +1,8 @@
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
 import CommonInstance from './common';
 declare class GoldfishInstance extends CommonInstance {
-    private appRunDir;
+    appRunDir: string;
+    emulatorStartedFlag: string;
     constructor(params: INewGoldfishInstanceParams);
     /**
      * 1. 启动模拟器
@@ -31,5 +32,14 @@ declare class GoldfishInstance extends CommonInstance {
      * @param sourceRoot
      */
     pushRpk(sourceRoot: string): Promise<void>;
+    /**
+     * 重新推送，然后重启应用
+     */
+    pushAndReloadApp(): Promise<void>;
+    /**
+     * 重启应用
+     */
+    reloadApp(): Promise<void>;
+    reboot(): Promise<boolean>;
 }
 export default GoldfishInstance;

package/lib/instance/dev.js

@@ -35,19 +35,19 @@ 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 path_1 = require("path");
-const constants_1 = require("../static/constants");
-const common_1 = __importDefault(require("./common"));
-const os_1 = __importDefault(require("os"));
-const fs_1 = __importDefault(require("fs"));
 const dayjs_1 = __importDefault(require("dayjs"));
+const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const common_1 = __importDefault(require("./common"));
 class GoldfishInstance extends common_1.default {
     constructor(params) {
         super(params);
         this.appRunDir = '/data/app';
+        this.emulatorStartedFlag = '(NSH)';
     }
     /**
      * 1. 启动模拟器
@@ -57,12 +57,12 @@ class GoldfishInstance 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);
-            const connected = yield this.connectGoldfish(120);
+            const connected = yield this.isConnected();
             if (connected) {
-                ColorConsole_1.default.log('### Emulator ### Goldfish emulator connected successfully');
+                shared_utils_1.ColorConsole.log('### Emulator ### Goldfish emulator connected successfully');
                 if (this.isFirstStart && this.startOptions.serverPort) {
                     yield this.createWebsockeServer();
                 }
@@ -72,8 +72,8 @@ class GoldfishInstance extends common_1.default {
                     ? this.projectPath
                     : this.isDistributedApp
                         ? options.dist ||
-                            path_1.posix.resolve(this.projectPath, './build', `${this.projectInfo.package}.watch`)
-                        : path_1.posix.resolve(this.projectPath, './build');
+                            path_1.default.join(this.projectPath, './build', `${this.projectInfo.package}.watch`)
+                        : path_1.default.join(this.projectPath, './build');
                 yield this.pushRpk(buildedFilesPath);
                 // 在模拟器中启动快应用
                 this.startupQuickApp(options);
@@ -81,7 +81,7 @@ class GoldfishInstance 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);
             }
         });
@@ -95,16 +95,16 @@ class GoldfishInstance extends common_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const { package: packageName } = this.projectInfo;
-                let vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp app/${packageName} &`;
+                let vappCmd = `adb -s ${this.sn} shell vapp app/${packageName} &`;
                 if (options.devtool) {
-                    vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
+                    vappCmd = `adb -s ${this.sn} 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}`);
             }
         });
     }
@@ -123,25 +123,25 @@ class GoldfishInstance extends common_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const { avdName, devtool, origin = 'terminal' } = options;
             const emulatorBin = this.getEmulatorBinPath();
-            ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
+            shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
             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.posix.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}`);
             // 端口映射
-            let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
+            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`;
             }
             // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
-            const systemImageBin = path_1.posix.resolve(avdImagePath, 'system.img');
-            const dataImageBin = path_1.posix.resolve(avdImagePath, 'data.img');
+            const systemImageBin = path_1.default.join(avdImagePath, 'system.img');
+            const dataImageBin = path_1.default.join(avdImagePath, 'data.img');
             // 复制可写文件到AVD目录下（多模拟器实例时需要）
-            const dataImageBinInAvd = path_1.posix.join(this.avdHome, `${avdName}.avd`, 'data.img');
+            const dataImageBinInAvd = path_1.default.join(this.avdHome, `${avdName}.avd`, 'data.img');
             if (!fs_1.default.existsSync(dataImageBinInAvd)) {
                 // data.img不存在时直接copy
                 fs_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
@@ -155,7 +155,7 @@ class GoldfishInstance extends common_1.default {
                 }
             }
             // 复制可写文件到AVD目录下（多模拟器实例时需要）
-            const systemImageBinInAvd = path_1.posix.join(this.avdHome, `${avdName}.avd`, 'system.img');
+            const systemImageBinInAvd = path_1.default.join(this.avdHome, `${avdName}.avd`, 'system.img');
             if (!fs_1.default.existsSync(systemImageBinInAvd)) {
                 // data.img不存在时直接copy
                 fs_1.default.copyFileSync(systemImageBin, systemImageBinInAvd);
@@ -186,19 +186,18 @@ class GoldfishInstance extends common_1.default {
 -drive index=1,id=userdata,if=none,format=raw,file=${dataImageBinInAvd} \
 -device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
 -device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
-            // 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}`;
             }
-            // 启动goldfish的命令和参数
-            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;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: 'pipe', shell: true });
@@ -211,7 +210,7 @@ class GoldfishInstance extends common_1.default {
                     (_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}`);
+                    shared_utils_1.ColorConsole.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
                     if (options.exitCallback) {
                         options.exitCallback(code);
                     }
@@ -222,8 +221,8 @@ class GoldfishInstance extends common_1.default {
                         const stdoutCb = options.stdoutCallback || console.log;
                         stdoutCb(msg);
                     }
-                    if (msg.includes('(NSH)')) {
-                        ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
+                    if (msg.includes(this.emulatorStartedFlag)) {
+                        shared_utils_1.ColorConsole.log(`### Emulator ### Goldfish emulator starts successfully`);
                         resolve();
                     }
                 });
@@ -236,10 +235,10 @@ class GoldfishInstance extends common_1.default {
      */
     pushRpk(sourceRoot) {
         return __awaiter(this, void 0, void 0, function* () {
-            const sn = `127.0.0.1:${this.startOptions.adbPort}`;
+            const sn = this.sn;
             const { package: appPackageName } = this.projectInfo;
             // 获取最后一层目录，比如build
-            const basename = path_1.posix.basename(sourceRoot);
+            const basename = path_1.default.basename(sourceRoot);
             if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
                 // windows系统或者项目路径有空格：1. adb push目录；2. 在模拟器中使用mv命令重命名
                 yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourceRoot} ${this.appRunDir}`);
@@ -247,11 +246,57 @@ class GoldfishInstance extends common_1.default {
             }
             else {
                 // 支持通配符处理: 1. 模拟器中mkdir创建目录 2. adb push ./XXXXX/* /XXX
-                const sourcePath = path_1.posix.resolve(sourceRoot, './*');
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} shell mkdir ${this.appRunDir}/${appPackageName}`);
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourcePath} ${this.appRunDir}/${appPackageName}`);
+                const sourcePath = path_1.default.join(sourceRoot, './*');
+                const mkdirCmd = `adb -s ${sn} shell mkdir ${this.appRunDir}/${appPackageName}`;
+                shared_utils_1.ColorConsole.log(`### Emulator ### mkdir CMD: ${mkdirCmd}`);
+                yield adbMiwt.execAdbCmdAsync(mkdirCmd);
+                const pushCmd = `adb -s ${sn} push ${sourcePath} ${this.appRunDir}/${appPackageName}`;
+                shared_utils_1.ColorConsole.log(`### Emulator ### pushCmd CMD: ${pushCmd}`);
+                yield adbMiwt.execAdbCmdAsync(pushCmd);
             }
-            ColorConsole_1.default.info(`### Emulator push to ${this.appRunDir}/${appPackageName} successfully`);
+            shared_utils_1.ColorConsole.info(`### Emulator push to ${this.appRunDir}/${appPackageName} successfully`);
+        });
+    }
+    /**
+     * 重新推送，然后重启应用
+     */
+    pushAndReloadApp() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // 1. 将整包重新推到miwear中（TODO：增量更新）
+                // adb push快应用到模拟器的/data/app目录
+                // aspect应用后续要考虑各种形状表盘的推包
+                const buildedFilesPath = this.isRpk
+                    ? this.projectPath
+                    : this.isDistributedApp
+                        ? ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.dist) ||
+                            path_1.default.join(this.projectPath, './build', `${this.projectInfo.package}.watch`)
+                        : path_1.default.join(this.projectPath, './build');
+                yield this.pushRpk(buildedFilesPath);
+                this.reloadApp();
+            }
+            catch (e) {
+                shared_utils_1.ColorConsole.error(`${e}`);
+            }
+        });
+    }
+    /**
+     * 重启应用
+     */
+    reloadApp() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { package: appPackageName } = this.projectInfo;
+            this.startupQuickApp(this.startOptions);
+            shared_utils_1.ColorConsole.info(`### Emulator start ${appPackageName} successfully`);
+        });
+    }
+    reboot() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rebootCmd = `adb -s ${this.sn} shell reboot`;
+            shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${rebootCmd}`);
+            yield adbMiwt.execAdbCmdAsync(rebootCmd);
+            return this.isConnected();
         });
     }
 }

package/lib/instance/index.d.ts

@@ -1,13 +1,15 @@
 import { INewGoldfishInstanceParams } from '../typing/Instance';
 import CommonInstance from './common';
 import GoldfishInstance from './dev';
-import MiwearInstance from "./miwear";
+import MiwearInstance from './miwear';
 import OldGoldfishInstance from './preDev';
+import PreInstance from './pre';
 /**
  * 根据镜像决定使用哪个instance
  * Vela正式版(4.0) -> MiwearInstance
+ * Vela正式版(不带 miwear 版本) -> PreInstance
  * Vela开发版（dev, 0.0.2) -> OldGoldfishInstance
  * Vela开发版（dev)，除0.0.2的其他版本 -> GoldfishInstance
  */
 declare function findInstance(avdName: string, params: INewGoldfishInstanceParams): GoldfishInstance | MiwearInstance | OldGoldfishInstance | undefined;
-export { CommonInstance, GoldfishInstance, MiwearInstance, OldGoldfishInstance, findInstance };
+export { CommonInstance, GoldfishInstance, MiwearInstance, OldGoldfishInstance, PreInstance, findInstance };

package/lib/instance/index.js

@@ -3,8 +3,8 @@ 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"));
+exports.findInstance = exports.PreInstance = exports.OldGoldfishInstance = exports.MiwearInstance = exports.GoldfishInstance = exports.CommonInstance = void 0;
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const avd_1 = __importDefault(require("../avd"));
 const common_1 = __importDefault(require("./common"));
 exports.CommonInstance = common_1.default;
@@ -14,9 +14,12 @@ const miwear_1 = __importDefault(require("./miwear"));
 exports.MiwearInstance = miwear_1.default;
 const preDev_1 = __importDefault(require("./preDev"));
 exports.OldGoldfishInstance = preDev_1.default;
+const pre_1 = __importDefault(require("./pre"));
+exports.PreInstance = pre_1.default;
 /**
  * 根据镜像决定使用哪个instance
  * Vela正式版(4.0) -> MiwearInstance
+ * Vela正式版(不带 miwear 版本) -> PreInstance
  * Vela开发版（dev, 0.0.2) -> OldGoldfishInstance
  * Vela开发版（dev)，除0.0.2的其他版本 -> GoldfishInstance
  */
@@ -24,9 +27,12 @@ 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`);
+        shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
         return;
     }
+    if (avdImagePath.includes('vela-pre-4.0')) {
+        return new pre_1.default(params);
+    }
     if (avdImagePath.includes('release')) {
         return new miwear_1.default(params);
     }

package/lib/instance/miwear.d.ts

@@ -6,9 +6,11 @@ import CommonInstance from './common';
  */
 declare class MiwearInstance extends CommonInstance {
     private params;
+    quickappStartedFlag: RegExp;
     private appPathInEmulator;
     private debugSocket?;
     private reconnectCount;
+    emulatorStartedFlag: RegExp;
     constructor(params: INewGoldfishInstanceParams);
     /**
      * 1. 启动模拟器
@@ -65,6 +67,7 @@ declare class MiwearInstance extends CommonInstance {
      * 2. nsh中执行am stop命令退出快应用
      * 3. nsh中执行am start命令启动快应用
      */
+    pushAndReloadApp(): Promise<void>;
     reloadApp(): Promise<void>;
     /**
      * 创建server端，监听打包过程中client端发来的消息