@aiot-toolkit/emulator 2.0.2-dev.4 → 2.0.2-dev.6

package/lib/avd/index.js

@@ -3,6 +3,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 fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const constants_1 = require("../static/constants");
@@ -62,7 +63,7 @@ class VelaAvdCls {
             return true;
         }
         catch (e) {
-            return false;
+            throw (`createVelaAvd: ${e.message}`);
         }
     }
     getVelaAvdInfo(avdName) {
@@ -76,24 +77,30 @@ class VelaAvdCls {
         };
         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 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]);
-        return avdInfo;
+        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]);
+            return avdInfo;
+        }
+        catch (err) {
+            ColorConsole_1.default.log(`getVelaAvdInfo: ${err.message}`);
+            return avdInfo;
+        }
     }
     deleteVelaAvd(avdName) {
         const avdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
@@ -108,23 +115,18 @@ class VelaAvdCls {
         }
     }
     getVelaAvdList() {
-        try {
-            const avdList = [];
-            const files = fs_1.default.readdirSync(constants_1.defaultAvdHome);
-            const regex = /^(Vela[\d\D]*)\.avd$/;
-            for (const fileName of files) {
-                const matcher = fileName.match(regex);
-                if (matcher) {
-                    const avdName = matcher[1];
-                    const avdInfo = this.getVelaAvdInfo(avdName);
-                    avdList.push(avdInfo);
-                }
+        const avdList = [];
+        const files = fs_1.default.readdirSync(this.avdHome);
+        const regex = /^(Vela[\d\D]*)\.avd$/;
+        for (const fileName of files) {
+            const matcher = fileName.match(regex);
+            if (matcher) {
+                const avdName = matcher[1];
+                const avdInfo = this.getVelaAvdInfo(avdName);
+                avdList.push(avdInfo);
             }
-            return avdList;
-        }
-        catch (err) {
-            return [];
         }
+        return avdList;
     }
     getVelaSkinList() {
         try {

package/lib/instance/common.d.ts

@@ -17,6 +17,7 @@ declare class CommonInstance {
     isFirstStart: boolean;
     startOptions: IStartOptions | undefined;
     projectInfo: IManifest;
+    isRpk: boolean;
     constructor(params: INewGoldfishInstanceParams);
     /** 获取模拟器二进制文件所在位置 */
     getEmulatorBinPath(): string;

package/lib/instance/common.js

@@ -57,6 +57,7 @@ class CommonInstance {
         this.projectPath = params.projectPath;
         this.sdkHome = params.sdkHome || constants_1.defaultSDKHome;
         this.avdHome = params.avdHome || constants_1.defaultAvdHome;
+        this.isRpk = params.sourceRoot === './';
         this.velaAvdCls = new avd_1.default({
             sdkHome: this.sdkHome,
             avdHome: this.avdHome
@@ -84,7 +85,8 @@ class CommonInstance {
                     yield this.createWebsockeServer();
                 }
                 // adb push快应用到模拟器的/data/app目录
-                yield this.pushRpk(path_1.default.resolve(this.projectPath, './dist'));
+                const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
+                this.pushRpk(buildedFilesPath);
                 // 在模拟器中启动快应用
                 this.startupQuickApp(options);
                 this.isFirstStart = false;
@@ -260,10 +262,7 @@ class CommonInstance {
     }
     /** 重启模拟器 */
     restart() {
-        if (this.goldfishProcess) {
-            this.killProcess(this.goldfishProcess);
-            this.goldfishProcess = undefined;
-        }
+        this.stop();
         this.start(this.startOptions);
     }
     /** 创建server */

package/lib/instance/dev.js

@@ -60,7 +60,8 @@ class GoldfishInstance extends common_1.default {
                     yield this.createWebsockeServer();
                 }
                 // adb push快应用到模拟器的/data/app目录
-                yield this.pushRpk(path_1.default.resolve(this.projectPath, './build'));
+                const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
+                yield this.pushRpk(buildedFilesPath);
                 // 在模拟器中启动快应用
                 this.startupQuickApp(options);
                 this.isFirstStart = false;
@@ -148,7 +149,8 @@ class GoldfishInstance extends common_1.default {
                         }
                     });
                     (_b = this.goldfishProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                        console.log(data.toString());
+                        const stderrCb = options.stderrCallback || console.log;
+                        stderrCb(data.toString());
                     });
                 }
                 else {
@@ -159,6 +161,9 @@ class GoldfishInstance extends common_1.default {
                 }
                 this.goldfishProcess.on('exit', (code) => {
                     ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+                    if (options.exitCallback) {
+                        options.exitCallback(code);
+                    }
                 });
             });
         });

package/lib/instance/miwear.d.ts

@@ -6,6 +6,7 @@ import CommonInstance from './common';
  */
 declare class MiwearInstance extends CommonInstance {
     private appPathInEmulator;
+    private debugSocket?;
     constructor(params: INewGoldfishInstanceParams);
     /** 在goldfish模拟器中运行快应用 */
     start(options: IStartOptions): Promise<void>;
@@ -17,5 +18,10 @@ declare class MiwearInstance extends CommonInstance {
     startupQuickApp(options: IStartOptions): Promise<void>;
     /** 将快应用安装到应用列表 */
     installRpkToAppList(rpkPath: string, targetDir: string): Promise<void>;
+    initDebugSocket(): Promise<void> | undefined;
+    /** 通知模拟器更新 */
+    handleUpdate(): Promise<void>;
+    /** 创建server */
+    createWebsockeServer(): Promise<void>;
 }
 export default MiwearInstance;

package/lib/instance/miwear.js

@@ -42,6 +42,7 @@ const child_process_1 = require("child_process");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const portfinder_1 = __importDefault(require("portfinder"));
+const ws_1 = __importStar(require("ws"));
 const constants_1 = require("../static/constants");
 const utils_1 = require("../utils");
 const common_1 = __importDefault(require("./common"));
@@ -64,6 +65,9 @@ class MiwearInstance extends common_1.default {
             const connected = yield this.connectGoldfish();
             if (connected) {
                 ColorConsole_1.default.info('### Emulator ### Goldfish emulator connected successfully');
+                if (this.isFirstStart && this.startOptions.serverPort) {
+                    yield this.createWebsockeServer();
+                }
                 this.startupQuickApp(options);
                 this.isFirstStart = false;
             }
@@ -116,30 +120,37 @@ class MiwearInstance extends common_1.default {
             const spawnBin = spawnArgs.shift();
             ColorConsole_1.default.log(`### Emulator ### Start CMD: ${cmd}`);
             return new Promise((resolve) => {
-                var _a;
+                var _a, _b, _c;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: stdioType, shell: true });
                 (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                    console.log(data.toString());
+                    const stderrCb = options.stderrCallback || console.log;
+                    stderrCb(data.toString());
                 });
                 this.goldfishProcess.on('exit', (code) => {
                     ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+                    if (options.exitCallback) {
+                        options.exitCallback(code);
+                    }
                 });
-                const p1 = new Promise((resolve) => {
-                    var _a, _b;
-                    (_b = (_a = this.goldfishProcess) === null || _a === void 0 ? void 0 : _a.stdout) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+                if (options.disableNSH) {
+                    (_c = (_b = this.goldfishProcess) === null || _b === void 0 ? void 0 : _b.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (data) => {
+                        const msg = data.toString();
                         const stdoutCb = options.stdoutCallback || console.log;
-                        stdoutCb(data.toString());
-                        // if (data.toString().includes('proto_on_start: on_start finished')) {
-                        //   ColorConsole.info(`### Emulator ### Goldfish emulator starts successfully`)
-                        //   resolve()
-                        // }
+                        stdoutCb(msg);
+                        if (msg.match(/quickapp_rpk_installer_init|rpk installer init done/)) {
+                            ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
+                            resolve();
+                        }
                     });
-                });
-                const p2 = setTimeout(() => {
+                }
+                else {
+                    setTimeout(() => {
+                        ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
+                        resolve();
+                    }, 8000);
                     ColorConsole_1.default.info(`### Emulator ### Goldfish emulator starts successfully`);
                     resolve();
-                }, 8000);
-                return Promise.race([p1, p2]);
+                }
             });
         });
     }
@@ -215,12 +226,12 @@ class MiwearInstance extends common_1.default {
                     yield (0, utils_1.sleep)(2000);
                 }
                 // 2. adb push应用的rpk
-                const pushCmd = `adb -s ${sn} push ${rpkPath} ${targetDir}`;
+                const targetPath = `${targetDir}/${packageName}.rpk`;
+                const pushCmd = `adb -s ${sn} push ${rpkPath} ${targetPath}`;
                 ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
                 yield adbMiwt.execAdbCmdAsync(pushCmd);
                 yield (0, utils_1.sleep)(100);
                 // 3. 安装应用
-                const targetPath = `${targetDir}/${rpkName}`;
                 const installCmd = `adb -s ${sn} shell pm install ${targetPath}`;
                 ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
                 adbMiwt.execAdbCmdAsync(installCmd);
@@ -228,5 +239,70 @@ class MiwearInstance extends common_1.default {
             catch (e) { }
         });
     }
+    initDebugSocket() {
+        if (this.debugSocket) {
+            return Promise.resolve();
+        }
+        this.debugSocket = new ws_1.default(`ws://localhost:${this.debugPort}`);
+        this.debugSocket.onopen = e => {
+            ColorConsole_1.default.info(`### debugSocket connect success`);
+            return Promise.resolve();
+        };
+        this.debugSocket.onerror = (e) => {
+            ColorConsole_1.default.error(`### Emulator ${e.data}`);
+        };
+        this.debugSocket.onclose = (e) => {
+            ColorConsole_1.default.error(`### Emulator debugSocket connect close: ${e.data}`);
+            this.debugSocket = undefined;
+        };
+    }
+    /** 通知模拟器更新 */
+    handleUpdate() {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.initDebugSocket();
+            // 1. 将整包重新推到miwear中（TODO：增量更新）
+            const sn = `127.0.0.1:${this.adbPort}`;
+            const { package: appPackageName } = this.projectInfo;
+            const sourcePath = path_1.default.resolve(this.projectPath, './build/*');
+            yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourcePath} ${this.appPathInEmulator}/${appPackageName}`);
+            ColorConsole_1.default.info(`### Emulator push to ${this.appPathInEmulator}/${appPackageName} successfully`);
+            // 2. 下发CDP命令给调试服务告知刷新
+            if (((_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.readyState) === ws_1.default.OPEN) {
+                (_b = this.debugSocket) === null || _b === void 0 ? void 0 : _b.send(JSON.stringify({ id: 10000, method: 'Page.reload', params: {} }));
+            }
+        });
+    }
+    /** 创建server */
+    createWebsockeServer() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const wsServer = new ws_1.WebSocketServer({
+                port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort,
+            });
+            wsServer.on('connection', socket => {
+                ColorConsole_1.default.success(`### App Socket server ### Websocket connects to websocket server`);
+                socket.on('error', err => {
+                    ColorConsole_1.default.error(`### App Socket server ### Websocket server error: ${err.message}`);
+                });
+                socket.on('message', (data) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    const message = JSON.parse(data.toString());
+                    ColorConsole_1.default.log(`### App Socket server ### Websocket server get data: ${data}`);
+                    if (message.type === 'restart') {
+                        // 非调试模式下无法热更新
+                        if (!((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.devtool)) {
+                            this.restart();
+                            return;
+                        }
+                        this.handleUpdate();
+                    }
+                    else if (message.type === 'stop') {
+                        this.stop();
+                    }
+                }));
+            });
+        });
+    }
 }
 exports.default = MiwearInstance;

package/lib/instance/preDev.js

@@ -35,7 +35,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const UxFileUtils_1 = __importDefault(require("@aiot-toolkit/aiotpack/lib/utils/ux/UxFileUtils"));
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
 const adbMiwt = __importStar(require("@miwt/adb"));
@@ -58,8 +57,9 @@ class OldGoldfishInstance extends common_1.default {
             // host启动9p server
             yield this.ensure9pServerRunnning();
             this.startOptions = options;
-            // 将rpk推到host的QuickappHome目录
-            this.pushRpk(path_1.default.resolve(this.projectPath, './build'));
+            // 将rpk推到host的./export/qa/app目录
+            const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
+            this.pushRpk(buildedFilesPath);
             // 启动模拟器
             yield this.startGoldfish(options);
             const connected = yield this.connectGoldfish();
@@ -190,10 +190,14 @@ class OldGoldfishInstance extends common_1.default {
                 var _a;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: stdioType, shell: true });
                 (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                    console.log(data.toString());
+                    const stderrCb = options.stderrCallback || console.log;
+                    stderrCb(data.toString());
                 });
                 this.goldfishProcess.on('exit', (code) => {
                     ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+                    if (options.exitCallback) {
+                        options.exitCallback(code);
+                    }
                 });
                 const p1 = new Promise((resolve) => {
                     var _a, _b;
@@ -246,7 +250,7 @@ class OldGoldfishInstance extends common_1.default {
     }
     pushRpk(sourceRoot) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { package: appPackageName } = UxFileUtils_1.default.getMainfestInfo(this.projectPath);
+            const { package: appPackageName } = this.projectInfo;
             const appRunDir = path_1.default.resolve(this.sdkHome, 'qa/app', appPackageName);
             ColorConsole_1.default.log(`### Emulator ### Pushing ${appPackageName} to ${appRunDir}`);
             fs_1.default.rmSync(appRunDir, { recursive: true, force: true });

package/lib/typing/Instance.d.ts

@@ -11,4 +11,6 @@ export interface IStartOptions {
     serverPort?: number;
     vncPort?: number;
     stdoutCallback?: (buffer: Buffer) => void;
+    stderrCallback?: (buffer: Buffer) => void;
+    exitCallback?: (code: number | null) => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-dev.4",
+  "version": "2.0.2-dev.6",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,10 +35,10 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-dev.4",
-    "@aiot-toolkit/shared-utils": "2.0.2-dev.4",
+    "@aiot-toolkit/aiotpack": "2.0.2-dev.6",
+    "@aiot-toolkit/shared-utils": "2.0.2-dev.6",
     "find-process": "^1.4.7",
     "portfinder": "^1.0.32"
   },
-  "gitHead": "534fdc7c6f018623c05499bf9add8db813ef8660"
+  "gitHead": "736a21d4d2f4fcc102766312d2529e426f27b6c4"
 }