npm - @aiot-toolkit/emulator - Versions diffs - 2.0.2-beta.10 → 2.0.2-beta.11 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/lib/avd/index.js CHANGED Viewed

@@ -3,18 +3,18 @@ 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 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 {
@@ -81,7 +81,7 @@ class VelaAvdCls {
             return true;
         }
         catch (e) {
-            throw (`createVelaAvd: ${e.message}`);
+            throw `createVelaAvd: ${e.message}`;
         }
     }
     /** 根据AVD名字获取模拟器的详细信息 */
@@ -117,7 +117,7 @@ class VelaAvdCls {
             return avdInfo;
         }
         catch (err) {
-            ColorConsole_1.default.log(`getVelaAvdInfo: ${err.message}`);
+            shared_utils_1.ColorConsole.log(`getVelaAvdInfo: ${err.message}`);
             return avdInfo;
         }
     }

package/lib/index.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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}`);
+            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(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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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端发来的消息

package/lib/instance/miwear.js CHANGED Viewed

@@ -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}`);
+            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`;
+            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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -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}`);
+            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}`);
+            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/constants.js CHANGED Viewed

@@ -25,8 +25,8 @@ exports.VelaImageVersionList = [
     {
         label: 'vela开发版（dev, 0.0.2）',
         value: 'vela-dev-0.0.2',
-        time: '2023-12-04T16:31:00',
-    },
+        time: '2023-12-04T16:31:00'
+    }
 ];
 exports.EmulatorEnvVersion = {
     name: '模拟器资源版本管理',

package/lib/typing/Instance.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import IJavascriptCompileOption from '@aiot-toolkit/aiotpack/lib/compiler/javascript/interface/IJavascriptCompileOption';
+import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
 import { IAvdResourcePaths } from './Avd';
 export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
     projectPath: string;
@@ -13,7 +13,7 @@ export interface IStartOptions {
     disableNSH?: boolean;
     origin?: 'ide' | 'terminal';
     serverPort?: number;
-    vncPort?: number;
+    grpcPort?: number;
     adbPort: number;
     debugPort?: number;
     stdoutCallback?: (buffer: Buffer) => void;

package/lib/utils/index.d.ts CHANGED Viewed

@@ -11,3 +11,23 @@ export declare function killProcessByPid(pid: string): void;
 export declare function killProcessByCmd(cmd: string): Promise<void>;
 /** 延迟函数 */
 export declare function sleep(time: number): Promise<void>;
+/**
+ * 重复执行某个任务直到成功，或者超过最大次数
+ * @param task 任务，需要返回 bool 值表示是否执行成功
+ * @param {Number=} maxCount 最大重试次数
+ * @param {number=} duration 每次重试的间隔
+ */
+export declare function tryRun(task: (...args: any[]) => Promise<any>, maxCount?: number, duration?: number, currentCount?: number): Promise<boolean>;
+/**
+ * 延迟执行某个任务
+ * @param task
+ * @param duration
+ * @returns
+ */
+export declare function delayRun<T = any>(task: (...args: any[]) => Promise<T> | T, duration?: number): Promise<T>;
+/**
+ * 为avdPort寻找一个不被占用的端口
+ * 端口号必须是偶数且在5555和5585之间
+ * @returns {number}
+ */
+export declare function getEvenPort(): Promise<number | false | undefined>;

package/lib/utils/index.js CHANGED Viewed

@@ -12,17 +12,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = exports.killProcessByCmd = exports.killProcessByPid = exports.getSystemArch = void 0;
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+exports.getEvenPort = exports.delayRun = exports.tryRun = exports.sleep = exports.killProcessByCmd = exports.killProcessByPid = exports.getSystemArch = void 0;
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const child_process_1 = require("child_process");
 const find_process_1 = __importDefault(require("find-process"));
 const os_1 = __importDefault(require("os"));
 const semver_1 = __importDefault(require("semver"));
+const portfinder_1 = __importDefault(require("portfinder"));
 const cpuArch = {
     arm64: 'aarch64',
     aarch64: 'aarch64',
     x64: 'x86_64',
-    x86_64: 'x86_64',
+    x86_64: 'x86_64'
 };
 /** 获取mac电脑的CPU架构
  * node 15.0.0之后，m1芯片的mac的os.arch()才是arm64，在这之前都是x86
@@ -42,7 +43,7 @@ function getSystemArch() {
         }
     }
     if (osArch !== 'arm64' && osArch !== 'x64') {
-        return ColorConsole_1.default.throw(`unsupport system`);
+        return shared_utils_1.ColorConsole.throw(`unsupport system`);
     }
     return cpuArch[osArch];
 }
@@ -50,9 +51,7 @@ exports.getSystemArch = getSystemArch;
 /** 根据PID杀死进程 */
 function killProcessByPid(pid) {
     try {
-        const cmd = os_1.default.platform() === "win32"
-            ? `taskkill /pid ${pid} /T /F`
-            : `kill -9 ${pid}`;
+        const cmd = os_1.default.platform() === 'win32' ? `taskkill /pid ${pid} /T /F` : `kill -9 ${pid}`;
         (0, child_process_1.execSync)(cmd);
     }
     catch (e) {
@@ -82,7 +81,65 @@ exports.killProcessByCmd = killProcessByCmd;
 /** 延迟函数 */
 function sleep(time) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise(resolve => setTimeout(resolve, time));
+        return new Promise((resolve) => setTimeout(resolve, time));
     });
 }
 exports.sleep = sleep;
+/**
+ * 重复执行某个任务直到成功，或者超过最大次数
+ * @param task 任务，需要返回 bool 值表示是否执行成功
+ * @param {Number=} maxCount 最大重试次数
+ * @param {number=} duration 每次重试的间隔
+ */
+function tryRun(task, maxCount = 5, duration = 1000, currentCount = 0) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (currentCount > maxCount)
+            return false;
+        return (Boolean(yield task()) ||
+            (yield delayRun(() => tryRun(task, maxCount, duration, currentCount + 1), duration)));
+    });
+}
+exports.tryRun = tryRun;
+/**
+ * 延迟执行某个任务
+ * @param task
+ * @param duration
+ * @returns
+ */
+function delayRun(task, duration = 1000) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve) => {
+            setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                return resolve(task());
+            }), duration);
+        });
+    });
+}
+exports.delayRun = delayRun;
+/**
+ * 为avdPort寻找一个不被占用的端口
+ * 端口号必须是偶数且在5555和5585之间
+ * @returns {number}
+ */
+function getEvenPort() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const startPort = 5555;
+        const stopPort = 5585;
+        let index = 1;
+        let port = yield portfinder_1.default.getPortPromise({
+            port: startPort,
+            stopPort
+        });
+        while (port % 2 !== 0) {
+            if (index > 30)
+                return false;
+            port = yield portfinder_1.default.getPortPromise({
+                port: startPort + index,
+                stopPort
+            });
+            index++;
+            return port;
+        }
+    });
+}
+exports.getEvenPort = getEvenPort;

package/package.json CHANGED Viewed

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