@aiot-toolkit/emulator 2.0.2-beta.13 → 2.0.2-beta.14

package/lib/instance/preDev.js

@@ -35,7 +35,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+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"));
 const child_process_1 = require("child_process");
 const find_process_1 = __importDefault(require("find-process"));
@@ -43,7 +44,9 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const portfinder_1 = __importDefault(require("portfinder"));
-const constants_1 = require("../static/constants");
+const readline_1 = __importDefault(require("readline"));
+const Instance_1 = require("../typing/Instance");
+const emulatorutil_1 = require("../emulatorutil");
 const common_1 = __importDefault(require("./common"));
 /**
  * OldGoldfishInstance
@@ -77,7 +80,7 @@ class OldGoldfishInstance extends common_1.default {
             // adb连接快应用
             const connected = yield this.connectGoldfish();
             if (connected) {
-                shared_utils_1.ColorConsole.log('### Emulator ### Goldfish emulator connected successfully');
+                ColorConsole_1.default.log('### Emulator ### Goldfish emulator connected successfully');
                 // 如果是首次启动，创建server端监听事件
                 if (this.isFirstStart && this.startOptions.serverPort) {
                     yield this.createWebsockeServer();
@@ -87,7 +90,7 @@ class OldGoldfishInstance extends common_1.default {
                 this.isFirstStart = false;
             }
             else {
-                shared_utils_1.ColorConsole.throw('### Emulator ### Failed to connect emulator, please check whether the adb is normal');
+                ColorConsole_1.default.throw('### Emulator ### Failed to connect emulator, please check whether the adb is normal');
             }
         });
     }
@@ -102,19 +105,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`;
-            shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${mountCmd}`);
+            ColorConsole_1.default.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} &`;
             }
-            shared_utils_1.ColorConsole.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
+            ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
             // vapp进程会一直pending，不会退出。这里必须加stdio: 'ignore'，否则快应用无法运行成功
             adbMiwt.execAdbCmdAsync(vappCmd, { stdio: 'ignore', encoding: 'utf-8' });
         }
         catch (e) {
-            shared_utils_1.ColorConsole.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
+            ColorConsole_1.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
         }
     }
     /** host启动9pServer
@@ -126,10 +129,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) {
-                shared_utils_1.ColorConsole.log('### Emulator ### 9p server started in host');
+                ColorConsole_1.default.log('### Emulator ### 9p server started in host');
                 return resolve();
             }
-            shared_utils_1.ColorConsole.log('### Emulator ### Starting 9p server in host');
+            ColorConsole_1.default.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);
@@ -146,15 +149,14 @@ class OldGoldfishInstance extends common_1.default {
             // 监听stderr，判断9p server是否启动成功了
             (_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+)/)) {
-                    shared_utils_1.ColorConsole.log(output);
-                    shared_utils_1.ColorConsole.log('### Emulator ### 9p server starts successfully');
+                if (emulatorutil_1.EmulatorLog.preDevIsStart(output)) {
+                    ColorConsole_1.default.log('### Emulator ### 9p server starts successfully');
                     return resolve();
                 }
             });
             // 监听exit事件，判断9p server是否退出了
             this.v9fsProcess.on('exit', (code) => {
-                shared_utils_1.ColorConsole.error(`### Emulator ### ya-vm-file-server exited with code ${code}`);
+                ColorConsole_1.default.error(`### Emulator ### ya-vm-file-server exited with code ${code}`);
                 return reject();
             });
         }));
@@ -171,82 +173,45 @@ class OldGoldfishInstance extends common_1.default {
      */
     startGoldfish(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { avdName, devtool, origin = 'terminal' } = options;
-            // 获取emulator bin的绝对路径
-            const emulatorBin = this.getEmulatorBinPath();
-            shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
-            // 获取vela镜像的绝对路径
-            const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath, customImagePath } = avdInfo;
-            shared_utils_1.ColorConsole.log(`### Emulator ### adb port: ${options.adbPort}`);
-            if (!avdImagePath) {
-                return shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
-            }
-            const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
-            shared_utils_1.ColorConsole.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
-            // 端口映射，adb端口和debug端口
-            let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
-            if (devtool) {
-                shared_utils_1.ColorConsole.log(`### Emulator ### debug port: ${options.debugPort}`);
-                portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
-            }
-            shared_utils_1.ColorConsole.log(`### Emulator ### Start qemu with TCP: ${portMappingStr}`);
-            // vnc配置
-            let noWindow = false;
-            let vncStr = '';
-            if (options.grpcPort) {
-                noWindow = true;
-                const portSuffix = options.grpcPort - constants_1.defaultVncPort;
-                vncStr = `-vnc :${portSuffix}`;
-            }
+            const { origin = Instance_1.IStartOrigin.Terminal } = options;
             // 启动goldfish的命令和参数
-            const spawnBin = emulatorBin;
-            const spawnArgs = [
-                '-nuttx',
-                '-avd',
-                avdName,
-                '-avd-arch',
-                avdArch,
-                '-show-kernel',
-                '-kernel',
-                nuttxBinPath,
-                noWindow ? '-no-window' : '',
-                '-qemu',
-                vncStr,
-                '-netdev',
-                portMappingStr,
-                '-device',
-                'virtio-net-device,netdev=u1,bus=virtio-mmio-bus.3'
-            ];
-            shared_utils_1.ColorConsole.log(`### Emulator ### Start CMD: ${spawnBin} ${spawnArgs.join(' ')}`);
+            const spawnArgs = emulatorutil_1.EmulatorCmd.createPreCmd(options, this.sdkHome, this.avdHome);
+            const spawnBin = spawnArgs && spawnArgs.shift();
+            if (!spawnArgs || !spawnBin)
+                return;
+            ColorConsole_1.default.log(`### Emulator ### Start CMD preDev: ${spawnBin} ${spawnArgs.join(' ')}`);
             return new Promise((resolve) => {
-                var _a, _b, _c, _d;
+                var _a, _b, _c;
                 this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: 'pipe', shell: true });
                 // 监听错误流
                 (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                     const stderrCb = options.stderrCallback || console.log;
                     stderrCb(data.toString());
                 });
-                if (origin === 'terminal') {
+                if (origin === Instance_1.IStartOrigin.Terminal) {
                     process.stdout.pipe(this.goldfishProcess.stdin);
-                    (_b = this.goldfishProcess.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
                 }
+                // 利用 readline 接口可解决子进程日志换行的问题
+                this.stdoutReadline = readline_1.default.createInterface({
+                    input: this.goldfishProcess.stdout
+                });
+                this.stderrReadline = readline_1.default.createInterface({
+                    input: this.goldfishProcess.stderr
+                });
                 // 监听模拟器的退出事件
                 this.goldfishProcess.on('exit', (code) => {
-                    shared_utils_1.ColorConsole.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
                     if (options.exitCallback) {
                         options.exitCallback(code);
                     }
                 });
                 // 监听输出流。输出了'(NSH)'标识后则认为模拟器启动成功
-                (_d = (_c = this.goldfishProcess) === null || _c === void 0 ? void 0 : _c.stdout) === null || _d === void 0 ? void 0 : _d.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.includes('(NSH)')) {
-                        shared_utils_1.ColorConsole.log(`### Emulator ### Goldfish emulator starts successfully`);
+                    const stdoutCb = options.stdoutCallback || console.log;
+                    stdoutCb(msg);
+                    if (emulatorutil_1.EmulatorLog.devIsStart(msg)) {
+                        ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
                         resolve();
                     }
                 });
@@ -261,10 +226,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);
-            shared_utils_1.ColorConsole.log(`### Emulator ### Pushing ${appPackageName} to ${appRunDir}`);
+            ColorConsole_1.default.log(`### Emulator ### Pushing ${appPackageName} to ${appRunDir}`);
             fs_1.default.rmSync(appRunDir, { recursive: true, force: true });
-            shared_utils_1.FileUtil.copyFiles(sourceRoot, appRunDir);
-            shared_utils_1.ColorConsole.log(`### Emulator ### Push ${appPackageName} to ${appRunDir} successfully`);
+            FileUtil_1.default.copyFiles(sourceRoot, appRunDir);
+            ColorConsole_1.default.log(`### Emulator ### Push ${appPackageName} to ${appRunDir} successfully`);
         });
     }
     /** 停止模拟器并释放相关资源 */

package/lib/typing/Instance.d.ts

@@ -11,7 +11,7 @@ export interface IStartOptions {
     devtool?: string;
     /** @deprecated */
     disableNSH?: boolean;
-    origin?: 'ide' | 'terminal';
+    origin?: IStartOrigin;
     serverPort?: number;
     grpcPort?: number;
     adbPort: number;
@@ -24,3 +24,7 @@ export interface IStartOptions {
     /** 要推送到的目的路径 */
     tar?: string;
 }
+export declare enum IStartOrigin {
+    Terminal = "terminal",
+    Ide = "ide"
+}

package/lib/typing/Instance.js

@@ -1,2 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IStartOrigin = void 0;
+var IStartOrigin;
+(function (IStartOrigin) {
+    IStartOrigin["Terminal"] = "terminal";
+    IStartOrigin["Ide"] = "ide";
+})(IStartOrigin || (exports.IStartOrigin = IStartOrigin = {}));

package/lib/utils/index.d.ts

@@ -30,4 +30,4 @@ export declare function delayRun<T = any>(task: (...args: any[]) => Promise<T> |
  * 端口号必须是偶数且在5555和5585之间
  * @returns {number}
  */
-export declare function getEvenPort(): Promise<number | false | undefined>;
+export declare function getEvenPort(): Promise<number | false>;

package/lib/utils/index.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const child_process_1 = require("child_process");
 const find_process_1 = __importDefault(require("find-process"));
 const os_1 = __importDefault(require("os"));
@@ -43,7 +43,7 @@ function getSystemArch() {
         }
     }
     if (osArch !== 'arm64' && osArch !== 'x64') {
-        return shared_utils_1.ColorConsole.throw(`unsupport system`);
+        return ColorConsole_1.default.throw(`unsupport system`);
     }
     return cpuArch[osArch];
 }
@@ -123,23 +123,23 @@ exports.delayRun = delayRun;
  */
 function getEvenPort() {
     return __awaiter(this, void 0, void 0, function* () {
-        const startPort = 5555;
-        const stopPort = 5585;
+        const startPort = 5556;
+        const stopPort = 5584;
         let index = 1;
         let port = yield portfinder_1.default.getPortPromise({
             port: startPort,
             stopPort
         });
         while (port % 2 !== 0) {
-            if (index > 30)
+            if (index > 13)
                 return false;
             port = yield portfinder_1.default.getPortPromise({
-                port: startPort + index,
+                port: startPort + 2,
                 stopPort
             });
             index++;
-            return port;
         }
+        return port;
     });
 }
 exports.getEvenPort = getEvenPort;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.13",
+  "version": "2.0.2-beta.14",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,16 +35,20 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.13",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.13",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.14",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.14",
+    "@miwt/adb": "^0.9.0",
+    "dayjs": "^1.11.12",
     "find-process": "^1.4.7",
     "fs-extra": "^11.2.0",
     "ini": "^4.1.3",
-    "portfinder": "^1.0.32"
+    "portfinder": "^1.0.32",
+    "semver": "^7.6.3",
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "30bf14ae958b66937da1b79dcfcd7c436e08af50"
+  "gitHead": "c6093733d0267d2d1359fec0af8f7a253955e3e3"
 }