@aiot-toolkit/emulator 2.0.1-alpha.9 → 2.0.2-beta.2

package/lib/instance/{goldfish.js → preDev.js}

@@ -35,8 +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 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"));
@@ -46,78 +44,57 @@ 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 avd_1 = __importDefault(require("../avd"));
 const constants_1 = require("../static/constants");
-class GoldfishInstance {
+const common_1 = __importDefault(require("./common"));
+class OldGoldfishInstance extends common_1.default {
     constructor(params) {
-        this.adbPort = 15555;
-        this.debugPort = 10055;
+        super(params);
         this.host9pPort = 7878;
-        this.projectPath = params.projectPath;
-        this.sdkHome = params.sdkHome || constants_1.defaultSDKHome;
-        this.avdHome = params.avdHome || constants_1.defaultAvdHome;
-        this.velaAvdCls = new avd_1.default({
-            sdkHome: this.sdkHome,
-            avdHome: this.avdHome
-        });
-        const { package: appPackageName } = UxFileUtils_1.default.getMainfestInfo(this.projectPath, params.sourceRoot);
-        this.packageName = appPackageName;
-    }
-    /** 获取模拟器二进制文件所在位置 */
-    getEmulatorBinPath() {
-        const osPlatform = os_1.default.platform();
-        const osArch = os_1.default.arch();
-        const platform = osPlatform === 'win32' ? 'windows' : osPlatform;
-        const arch = (osArch === 'arm64' || osArch === 'aarch64') ? 'aarch64' : 'x86_64';
-        return path_1.default.resolve(constants_1.defaultEmulatorHome, `${platform}-${arch}`, 'emulator');
     }
     /** 在goldfish模拟器中运行快应用 */
     start(options) {
         return __awaiter(this, void 0, void 0, function* () {
             // host启动9p server
             yield this.ensure9pServerRunnning();
-            // TODO: 打包快应用
-            // 将rpk推到host的defaultQuickappHome目录
-            this.pushRpk();
+            this.startOptions = options;
+            // 将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();
             if (connected) {
-                ColorConsole_1.default.log({
-                    message: '### Emulator ### Goldfish emulator connected successfully'
-                });
+                ColorConsole_1.default.log('### Emulator ### Goldfish emulator connected successfully');
+                if (this.isFirstStart && this.startOptions.serverPort) {
+                    yield this.createWebsockeServer();
+                }
                 // 在模拟器中启动快应用
                 this.startupQuickApp(options);
+                this.isFirstStart = false;
             }
             else {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: '### 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');
             }
         });
     }
     /** 在goldfish中启动快应用 */
     startupQuickApp(options) {
         try {
+            const { package: packageName } = this.projectInfo;
             const appMountDir = path_1.default.resolve(this.sdkHome, 'qa');
             const mountCmd = `adb -s 127.0.0.1:${this.adbPort} shell mount -t v9fs -o tag=10.0.2.2,port=${this.host9pPort},aname=${appMountDir} /data`;
-            ColorConsole_1.default.log({ message: `### 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:${this.adbPort} shell vapp app/${this.packageName} &`;
+            let vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp app/${packageName} &`;
             if (options.devtool) {
-                vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${this.packageName} &`;
+                vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
             }
-            ColorConsole_1.default.log({ message: `### 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) {
-            ColorConsole_1.default.log({
-                level: shared_utils_1.LOG_LEVEL.Error,
-                message: `### Emulator ### Failed to startup quickapp: ${e.message}`,
-                isOnlyPrintError: true
-            });
+            ColorConsole_1.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
         }
     }
     /** host启动9pServer */
@@ -127,12 +104,13 @@ class GoldfishInstance {
             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({ message: '### Emulator ### 9p server started in host' });
+                ColorConsole_1.default.log('### Emulator ### 9p server started in host');
                 return resolve();
             }
-            ColorConsole_1.default.log({ message: '### 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 serverBinPath = path_1.default.resolve(constants_1.defaultToolsHome, yaFileName);
+            const toolsHome = path_1.default.resolve(this.sdkHome, 'tools');
+            const serverBinPath = path_1.default.resolve(toolsHome, yaFileName);
             fs_1.default.chmodSync(serverBinPath, 0o777);
             this.host9pPort = yield portfinder_1.default.getPortPromise({ port: 7878 });
             const address = `127.0.0.1:${this.host9pPort}`;
@@ -146,17 +124,13 @@ class GoldfishInstance {
             (_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({ message: output });
-                    ColorConsole_1.default.log({ message: '### Emulator ### 9p server starts successfully' });
+                    ColorConsole_1.default.log(output);
+                    ColorConsole_1.default.log('### Emulator ### 9p server starts successfully');
                     return resolve();
                 }
             });
             this.v9fsProcess.on('exit', (code) => {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: `### Emulator ### ya-vm-file-server exited with code ${code}`,
-                    isOnlyPrintError: true
-                });
+                ColorConsole_1.default.error(`### Emulator ### ya-vm-file-server exited with code ${code}`);
                 return reject();
             });
         }));
@@ -166,70 +140,81 @@ class GoldfishInstance {
         return __awaiter(this, void 0, void 0, function* () {
             const { avdName, devtool } = options;
             const emulatorBin = this.getEmulatorBinPath();
-            ColorConsole_1.default.log({ message: `### Emulator ### emulator path: ${emulatorBin}` });
+            ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
             const { avdArch, avdImagePath } = avdInfo;
             this.adbPort = yield portfinder_1.default.getPortPromise({ port: this.adbPort });
-            ColorConsole_1.default.log({ message: `### Emulator ### adb port: ${this.adbPort}` });
+            ColorConsole_1.default.log(`### Emulator ### adb port: ${this.adbPort}`);
             if (!avdImagePath) {
-                ColorConsole_1.default.log({
-                    level: shared_utils_1.LOG_LEVEL.Error,
-                    message: `### Emulator ### Unable to find vela image via avd`
-                });
-                process.exit();
+                return ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
             }
             const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
-            ColorConsole_1.default.log({ message: `### Emulator ### nuttx path: ${nuttxBinPath}` });
+            ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
             let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
             if (devtool) {
                 this.debugPort = yield portfinder_1.default.getPortPromise({ port: this.debugPort });
-                ColorConsole_1.default.log({ message: `### Emulator ### debug port: ${this.debugPort}` });
+                ColorConsole_1.default.log(`### Emulator ### debug port: ${this.debugPort}`);
                 portMappingStr += `,hostfwd=tcp:127.0.0.1:${this.debugPort}-10.0.2.15:101`;
             }
-            ColorConsole_1.default.log({ message: `### Emulator ### Start qemu with TCP: ${portMappingStr}` });
+            ColorConsole_1.default.log(`### Emulator ### Start qemu with TCP: ${portMappingStr}`);
             const stdioType = options.disableNSH ? 'pipe' : 'inherit';
+            // vnc配置
+            let noWindow = false;
+            let vncStr = '';
+            if (options.vncPort) {
+                noWindow = true;
+                const portSuffix = options.vncPort - constants_1.defaultVncPort;
+                vncStr = `-vnc :${portSuffix}`;
+            }
+            // 启动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'
+            ];
+            ColorConsole_1.default.log(`### Emulator ### Start CMD: ${spawnBin} ${spawnArgs.join(' ')}`);
             return new Promise((resolve) => {
-                var _a, _b;
-                this.goldfishProcess = (0, child_process_1.spawn)(emulatorBin, [
-                    '-nuttx',
-                    '-avd',
-                    avdName,
-                    '-avd-arch',
-                    avdArch,
-                    '-show-kernel',
-                    '-kernel',
-                    nuttxBinPath,
-                    '-qemu',
-                    '-netdev',
-                    portMappingStr,
-                    '-device',
-                    'virtio-net-device,netdev=u1,bus=virtio-mmio-bus.3'
-                ], { stdio: stdioType });
-                if (options.disableNSH) {
-                    (_a = this.goldfishProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                        console.log(data.toString());
+                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) => {
+                    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) => {
+                        const stdoutCb = options.stdoutCallback || console.log;
+                        stdoutCb(data.toString());
                         if (data.toString().includes('(NSH)')) {
-                            ColorConsole_1.default.log({ message: `### Emulator ### Goldfish emulator starts successfully` });
+                            ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
                             resolve();
                         }
                     });
-                    (_b = this.goldfishProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                        console.log(data.toString());
-                    });
-                }
-                else {
-                    setTimeout(() => {
-                        ColorConsole_1.default.log({ message: `### Emulator ### Goldfish emulator starts successfully` });
-                        resolve();
-                    }, 2000);
-                }
-                this.goldfishProcess.on('exit', (code) => {
-                    ColorConsole_1.default.log({
-                        level: shared_utils_1.LOG_LEVEL.Error,
-                        message: `### Emulator ### Goldfish emulator exited with code ${code}`,
-                        isOnlyPrintError: true
-                    });
                 });
+                const p2 = setTimeout(() => {
+                    ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
+                    resolve();
+                }, 2000);
+                return Promise.race([p1, p2]);
             });
         });
     }
@@ -241,14 +226,14 @@ class GoldfishInstance {
                 const sn = `127.0.0.1:${this.adbPort}`;
                 while (!adbConnected) {
                     const adbKillCmd = `adb kill-server`;
-                    ColorConsole_1.default.log({ message: `### Emulator ### Excuting adb cmd: ${adbKillCmd}` });
+                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
                     adbMiwt.execAdbCmdSync(adbKillCmd);
                     const adbConnectCmd = `adb connect ${sn}`;
-                    ColorConsole_1.default.log({ message: `### Emulator ### Excuting adb cmd: ${adbConnectCmd}` });
+                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
                     const str = adbMiwt.execAdbCmdSync(adbConnectCmd);
-                    ColorConsole_1.default.log({ message: `### Emulator ### ${str}` });
+                    ColorConsole_1.default.log(`### Emulator ### ${str}`);
                     const devices = yield adbMiwt.getAdbDevices();
-                    ColorConsole_1.default.log({ message: `### Emulator ### adb devices: ${JSON.stringify(devices)}` });
+                    ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
                     adbConnected =
                         devices.filter((item) => item.sn === sn && item.status === 'device').length > 0;
                 }
@@ -263,50 +248,28 @@ class GoldfishInstance {
             return adbConnected;
         });
     }
-    /** 将打包后的文件推到挂载的快应用目录 */
-    pushRpk() {
-        const buildDir = path_1.default.resolve(this.projectPath, 'build');
-        const { package: appPackageName } = UxFileUtils_1.default.getMainfestInfo(this.projectPath);
-        const appRunDir = path_1.default.resolve(this.sdkHome, 'qa/app', appPackageName);
-        ColorConsole_1.default.log({ message: `### Emulator ### Pushing ${appPackageName} to ${appRunDir}` });
-        fs_1.default.rmSync(appRunDir, { recursive: true, force: true });
-        FileUtil_1.default.copyFiles(buildDir, appRunDir);
-        ColorConsole_1.default.log({
-            message: `### Emulator ### Push ${appPackageName} to ${appRunDir} successfully`
+    pushRpk(sourceRoot) {
+        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}`);
+            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`);
         });
     }
-    /** 杀死进程 */
-    killProcess(currProcess) {
-        if (currProcess && currProcess.pid && currProcess.exitCode === null) {
-            console.log('process pid:', currProcess.pid);
-            try {
-                if (os_1.default.platform() === 'win32') {
-                    (0, child_process_1.execSync)(`taskkill /pid ${currProcess.pid} /T /F`);
-                }
-                else if (os_1.default.platform() === 'darwin') {
-                    process.kill(currProcess.pid);
-                }
-                else {
-                    currProcess.kill();
-                }
-            }
-            catch (err) {
-                ColorConsole_1.default.log({ message: `kill process get error :\n${err.stack}` });
-            }
-        }
-    }
     /** 停止模拟器并释放相关资源 */
     stop() {
-        if (this.goldfishProcess) {
-            this.killProcess(this.goldfishProcess);
-            this.goldfishProcess = undefined;
-        }
-        if (this.v9fsProcess) {
-            this.killProcess(this.v9fsProcess);
-            this.v9fsProcess = undefined;
-        }
+        const _super = Object.create(null, {
+            stop: { get: () => super.stop }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            _super.stop.call(this);
+            if (this.v9fsProcess) {
+                this.killProcess(this.v9fsProcess);
+                this.v9fsProcess = undefined;
+            }
+        });
     }
 }
-exports.default = GoldfishInstance;
-
-//# sourceMappingURL=goldfish.js.map
+exports.default = OldGoldfishInstance;

package/lib/static/advancedFeatures.ini

@@ -0,0 +1 @@
+ModemSimulator = on

package/lib/static/constants.d.ts

@@ -5,3 +5,15 @@ export declare const defaultEmulatorHome: string;
 export declare const defaultSkinHome: string;
 export declare const defaultQuickappHome: string;
 export declare const defaultToolsHome: string;
+export declare const defaultVncPort = 5900;
+export declare const emulatorEnvVersion: {
+    name: string;
+    emulator: string;
+    qa: string;
+    skins: string;
+    'system-images': {
+        release: string;
+        dev: string;
+    };
+    tools: string;
+};

package/lib/static/constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultToolsHome = exports.defaultQuickappHome = exports.defaultSkinHome = exports.defaultEmulatorHome = exports.defaultImageHome = exports.defaultAvdHome = exports.defaultSDKHome = void 0;
+exports.emulatorEnvVersion = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultQuickappHome = exports.defaultSkinHome = exports.defaultEmulatorHome = exports.defaultImageHome = exports.defaultAvdHome = exports.defaultSDKHome = void 0;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 exports.defaultSDKHome = path_1.default.resolve(os_1.default.homedir(), '.export');
@@ -13,5 +13,15 @@ exports.defaultEmulatorHome = path_1.default.resolve(exports.defaultSDKHome, 'em
 exports.defaultSkinHome = path_1.default.resolve(exports.defaultSDKHome, 'skins');
 exports.defaultQuickappHome = path_1.default.resolve(exports.defaultSDKHome, 'qa');
 exports.defaultToolsHome = path_1.default.resolve(exports.defaultSDKHome, 'tools');
-
-//# sourceMappingURL=constants.js.map
+exports.defaultVncPort = 5900;
+exports.emulatorEnvVersion = {
+    name: '模拟器资源版本管理',
+    emulator: '0.0.1',
+    qa: '0.0.1',
+    skins: '0.0.1',
+    'system-images': {
+        release: '4.0',
+        dev: '0.0.2'
+    },
+    tools: '0.0.2'
+};

package/lib/static/debugger_ip.cfg

@@ -0,0 +1 @@
+10.0.2.15:101

package/lib/typing/Avd.js

@@ -6,5 +6,3 @@ var IAvdArchType;
     IAvdArchType["arm"] = "arm";
     IAvdArchType["arm64"] = "arm64";
 })(IAvdArchType || (exports.IAvdArchType = IAvdArchType = {}));
-
-//# sourceMappingURL=Avd.js.map

package/lib/typing/Instance.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { IAvdResourcePaths } from "./Avd";
 export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
     projectPath: string;
@@ -7,4 +8,9 @@ export interface IStartOptions {
     avdName: string;
     devtool?: string;
     disableNSH?: boolean;
+    serverPort?: number;
+    vncPort?: number;
+    stdoutCallback?: (buffer: Buffer) => void;
+    stderrCallback?: (buffer: Buffer) => void;
+    exitCallback?: (code: number | null) => void;
 }

package/lib/typing/Instance.js

@@ -1,4 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-
-//# sourceMappingURL=Instance.js.map

package/lib/utils/index.d.ts

@@ -0,0 +1,12 @@
+/** 获取mac电脑的CPU架构
+ * node 15.0.0之后，m1芯片的mac的os.arch()才是arm64，在这之前都是x86
+ * 所以15.0.0之前无法通过os.arch()区分，也无法通过execSync('uname -m')区分
+ */
+export declare function getSystemArch(): string | void;
+/** 根据PID杀死进程 */
+export declare function killProcessByPid(pid: string): void;
+/**
+ * 根据命令杀死进程
+ */
+export declare function killProcessByCmd(cmd: string): Promise<void>;
+export declare function sleep(time: number): Promise<void>;

package/lib/utils/index.js

@@ -0,0 +1,87 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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"));
+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 cpuArch = {
+    arm64: 'aarch64',
+    aarch64: 'aarch64',
+    x64: 'x86_64',
+    x86_64: 'x86_64',
+};
+/** 获取mac电脑的CPU架构
+ * node 15.0.0之后，m1芯片的mac的os.arch()才是arm64，在这之前都是x86
+ * 所以15.0.0之前无法通过os.arch()区分，也无法通过execSync('uname -m')区分
+ */
+function getSystemArch() {
+    const platform = os_1.default.platform();
+    let osArch = os_1.default.arch();
+    const nodeVersion = process.version;
+    if (semver_1.default.lt(nodeVersion, '15.0.0') && platform === 'darwin') {
+        try {
+            (0, child_process_1.execSync)('sysctl -n sysctl.proc_translated');
+            osArch = 'arm64';
+        }
+        catch (_a) {
+            osArch = 'x64';
+        }
+    }
+    if (osArch !== 'arm64' && osArch !== 'x64') {
+        return ColorConsole_1.default.throw(`unsupport system`);
+    }
+    return cpuArch[osArch];
+}
+exports.getSystemArch = getSystemArch;
+/** 根据PID杀死进程 */
+function killProcessByPid(pid) {
+    try {
+        const cmd = os_1.default.platform() === "win32"
+            ? `taskkill /pid ${pid} /T /F`
+            : `kill -9 ${pid}`;
+        (0, child_process_1.execSync)(cmd);
+    }
+    catch (e) {
+        console.error(`kill process ${pid} get error: ${e}`);
+    }
+}
+exports.killProcessByPid = killProcessByPid;
+/**
+ * 根据命令杀死进程
+ */
+function killProcessByCmd(cmd) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!cmd)
+            return;
+        try {
+            const list = yield (0, find_process_1.default)('name', cmd);
+            list.forEach((item) => __awaiter(this, void 0, void 0, function* () {
+                killProcessByPid(item.pid.toString());
+            }));
+        }
+        catch (e) {
+            console.error(`kill process ${cmd} get error: ${e}`);
+        }
+    });
+}
+exports.killProcessByCmd = killProcessByCmd;
+function sleep(time) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise(resolve => setTimeout(resolve, time));
+    });
+}
+exports.sleep = sleep;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.1-alpha.9",
+  "version": "2.0.2-beta.2",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,10 +35,10 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.1-alpha.9",
-    "@aiot-toolkit/shared-utils": "2.0.1-alpha.9",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.2",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.2",
     "find-process": "^1.4.7",
     "portfinder": "^1.0.32"
   },
-  "gitHead": "d593999b9ca345bce8b3ba40a7d11f6685ac03b5"
+  "gitHead": "5226bdb0ba61daef207531c2eaaf3d034e04c50f"
 }

package/lib/avd/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["avd/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import fs from 'fs'\nimport path from 'path'\nimport { defaultAvdHome, defaultImageHome, defaultSDKHome } from '../static/constants'\nimport { IAvdArchType, IAvdParams, IAvdResourcePaths } from '../typing/Avd'\n\nconst EAvdParamsToIni = {\n    'arm': {\n        abiType: 'armeabi-v7a',\n    },\n    'arm64': {\n        abiType: 'arm64-v8a',\n    }\n}\n\nclass VelaAvdCls {\n    private avdHome: string\n    private sdkHome: string\n\n    constructor(avdResourcePaths: IAvdResourcePaths) {\n        const { avdHome, sdkHome } = avdResourcePaths\n        this.avdHome = avdHome || defaultAvdHome\n        this.sdkHome = sdkHome || defaultSDKHome\n    }\n\n    createVelaAvd(avdParams: IAvdParams) {\n        const { avdName, avdArch, avdWidth, avdHeight, avdSkin, avdImagePath = defaultImageHome } = avdParams\n        const avdDir = path.resolve(this.avdHome, `${avdName}.avd`)\n        const avdIni = path.resolve(this.avdHome, `${avdName}.ini`)\n        const avdConfigIni = path.resolve(avdDir, 'config.ini')\n        const nuttxAvdIniContent = `path=${avdDir}\\npath.rel=avd${path.sep}${avdName}.avd`\n        const abiType = EAvdParamsToIni[avdArch]['abiType']\n        const configIniJson: any = JSON.parse(fs.readFileSync(path.join(__dirname, '../static/avdConfigIni.json'), 'utf-8'))\n        configIniJson['AvdId'] = avdName\n        configIniJson['abi.type'] = abiType\n        configIniJson['avd.ini.displayname'] = avdName\n        configIniJson['hw.cpu.arch'] = avdArch\n        if (avdSkin) {\n            delete configIniJson['hw.lcd.height']\n            delete configIniJson['hw.lcd.width']\n            configIniJson['skin.dynamic'] = 'yes'\n            configIniJson['skin.name'] = avdSkin\n            configIniJson['skin.path'] = path.resolve(this.sdkHome, 'skins', avdSkin)\n        } else {\n            configIniJson['hw.lcd.height'] = avdHeight\n            configIniJson['hw.lcd.width'] = avdWidth\n            configIniJson['skin.dynamic'] = 'no'\n            delete configIniJson['skin.name']\n            delete configIniJson['skin.path']\n        }\n        configIniJson['image.sysdir.1'] = avdImagePath\n        try {\n            fs.mkdirSync(avdDir, { recursive: true })\n            // 写入Vela_Virtual_Device.ini文件\n            fs.writeFileSync(avdIni, nuttxAvdIniContent)\n            // 写入Vela_Virtual_Device.avd/config.ini文件\n            const fWrite = fs.createWriteStream(avdConfigIni)\n            for (const item in configIniJson) {\n                const line = `${item} = ${configIniJson[item]}\\n`\n                fWrite.write(line);\n            }\n            fWrite.close();\n            return true\n        } catch (e) {\n            return false\n        }\n    }\n\n    getVelaAvdInfo(avdName: string) {\n        const avdInfo: IAvdParams = {\n            avdName,\n            avdArch: IAvdArchType.arm,\n            avdHeight: '',\n            avdWidth: '',\n            avdSkin: '',\n            avdImagePath: ''\n        }\n        const currAvdDir = path.resolve(this.avdHome, `${avdName}.avd`)\n        const configIni = path.resolve(currAvdDir, 'config.ini')\n        const contents = fs.readFileSync(configIni, 'utf-8')\n        // 这里需要使用惰性匹配\n        const archRegex = /hw.cpu.arch = ([\\d\\D]+?)\\n/\n        const archMatcher = contents.match(archRegex)\n        const heightRegex = /hw.lcd.height = ([\\d\\D]+?)\\n/\n        const heightMatcher = contents.match(heightRegex)\n        const widthRegex = /hw.lcd.width = ([\\d\\D]+?)\\n/\n        const widthMatcher = contents.match(widthRegex)\n        const skinRegex = /skin.name = ([\\d\\D]+?)\\n/\n        const skinMatcher = contents.match(skinRegex)\n        const imagePathRegex = /image.sysdir.1 = ([\\d\\D]+?)\\n/\n        const imagePathMather = contents.match(imagePathRegex)\n        archMatcher && (avdInfo.avdArch = (archMatcher[1] as IAvdArchType))\n        heightMatcher && (avdInfo.avdHeight = heightMatcher[1])\n        widthMatcher && (avdInfo.avdWidth = widthMatcher[1])\n        skinMatcher && (avdInfo.avdSkin = skinMatcher[1])\n        imagePathMather && (avdInfo.avdImagePath = imagePathMather[1])\n        return avdInfo\n    }\n\n    deleteVelaAvd(avdName: string) {\n        const avdDir = path.resolve(this.avdHome, `${avdName}.avd`)\n        const avdIni = path.resolve(this.avdHome, `${avdName}.ini`);\n        try {\n            fs.rmSync(avdDir, { recursive: true, force: true });\n            fs.rmSync(avdIni, { force: true })\n            return true\n        } catch (e) {\n            return false\n        }\n    }\n\n    getVelaAvdList() {\n        try {\n            const avdList: IAvdParams[] = [];\n            const files = fs.readdirSync(defaultAvdHome);\n            const regex = /^(Vela[\\d\\D]*)\\.avd$/;\n            for (const fileName of files) {\n                const matcher = fileName.match(regex);\n                if (matcher) {\n                    const avdName = matcher[1];\n                    const avdInfo = this.getVelaAvdInfo(avdName);\n                    avdList.push(avdInfo);\n                }\n            }\n            return avdList;\n        } catch (err) {\n            return [];\n        }\n    }\n\n    getVelaSkinList() {\n        try {\n            const skinList = []\n            const skinHome = path.resolve(this.sdkHome, 'skins')\n            let files = fs.readdirSync(skinHome)\n            for (const fileName of files) {\n                !fileName.startsWith('.') && skinList.push(fileName)\n            }\n            return skinList\n        } catch (e) {\n            return []\n        }\n    }\n}\n\nexport default VelaAvdCls\n"],"sourceRoot":"../../src"}

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,gDAA8C;AAM1B,2FANA,aAAU,OAMA;AAL9B,mEAAkE;AAKhE,iGALkB,kBAAgB,OAKlB;AAJlB,+CAA6B;AAC7B,oDAAkC","file":"index.js","sourcesContent":["import { default as VelaAvdCls } from './avd';\nimport { default as GoldfishInstance } from './instance/goldfish';\nexport * from './typing/Avd';\nexport * from './typing/Instance';\n\nexport {\n  GoldfishInstance, VelaAvdCls\n};\n\n"],"sourceRoot":"../src"}