@aiot-toolkit/emulator 2.0.6-beta.2 → 2.0.6-beta.4

package/lib/vvd/index.js

@@ -62,12 +62,13 @@ exports.isHeadlessEnvironment = isHeadlessEnvironment;
 class VvdManager {
   // 需要复制的文件
   binFiles = ['system.img', 'data.img', 'coredump.core', 'vela_data.bin', 'vela_resource.bin', 'vela_system.bin'];
-  constructor(vvdResourcePaths) {
+  constructor() {
+    let vvdResourcePaths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
-      vvdHome: avdHome,
+      vvdHome,
       sdkHome
     } = vvdResourcePaths;
-    this.vvdHome = avdHome || _constants.defaultVvdHome;
+    this.vvdHome = vvdHome || _constants.defaultVvdHome;
     this.sdkHome = sdkHome || _constants.defaultSDKHome;
     if (!_fs.default.existsSync(this.vvdHome)) {
       _fs.default.mkdirSync(this.vvdHome, {
@@ -181,7 +182,7 @@ class VvdManager {
       skin: '',
       imageDir: '',
       customLcdRadius: '',
-      imageType: _Vvd.VelaImageType.REL
+      imageType: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5
     };
     let currVvdDir = this.getVvdDir(vvdName);
     const configIni = _path.default.resolve(currVvdDir, 'config.ini');
@@ -196,7 +197,7 @@ class VvdManager {
       vvdInfo.imageDir = config['image.sysdir.2'];
       vvdInfo.customImagePath = config['image.sysdir.1'];
       vvdInfo.customLcdRadius = config['ide.lcd.radius'];
-      vvdInfo.imageType = config['ide.image.type'];
+      if (config['ide.image.type']) vvdInfo.imageType = config['ide.image.type'];
       if (vvdInfo.skin) {
         try {
           vvdInfo.skinInfo = this.getSkinInfo(vvdInfo.skin, config['skin.path']);
@@ -238,7 +239,12 @@ class VvdManager {
       const matcher = fileName.match(regex);
       if (matcher) {
         const avdName = matcher[1];
-        const avdInfo = this.getVvdInfo(avdName);
+        let avdInfo;
+        try {
+          avdInfo = this.getVvdInfo(avdName);
+        } catch (error) {
+          continue;
+        }
         avdList.push(avdInfo);
       }
     }
@@ -362,13 +368,17 @@ class VvdManager {
     let needUpdate = false;
 
     // 检查 ramsize 调整为 1024
-    if (config['hw.ramSize'] < 1024) {
+    if (config['hw.ramSize'] && typeof config['hw.ramSize'] === 'number' && config['hw.ramSize'] < 1024) {
       needUpdate = true;
       config['hw.ramSize'] = 1024;
     }
+    // 统一路径分隔符为 /
+    const normalizePath = p => p.replace(/\\/g, '/');
+
     // 检查皮肤路径
-    if (config['skin.path']?.includes('.export_dev/skins')) {
-      if (config['skin.path'].includes('.export_dev/skins/user')) {
+    const skinPath = config['skin.path'];
+    if (skinPath && normalizePath(skinPath.toString())?.includes('.export_dev/skins')) {
+      if (normalizePath(skinPath.toString())?.includes('.export_dev/skins/user')) {
         // 自定义的皮肤，将自定义皮肤迁移到新的 sdk 目录中
         const oldUserSkinDir = _path.default.join(_os.default.homedir(), '.export_dev/skins/user');
         const newUserSkinDir = _path.default.join(this.sdkHome, 'skins', 'user');
@@ -388,13 +398,26 @@ class VvdManager {
         }
       }
       needUpdate = true;
-      config['skin.path'] = config['skin.path'].replace('.export_dev/skins', '.vela/sdk/skins');
+      config['skin.path'] = normalizePath(skinPath.toString()).replace('.export_dev/skins', '.vela/sdk/skins');
+    }
+
+    // 迁移 原来 user 目录中的 xiaomi_band_10
+    if (skinPath && normalizePath(skinPath.toString())?.endsWith('/user/xiaomi_band_10')) {
+      _ColorConsole.default.log('migrate user/xiaomi_band_10 to builtin/xiaomi_band_10');
+      config['skin.path'] = normalizePath(skinPath.toString()).replace('/user/xiaomi_band_10', '/builtin/xiaomi_band_10');
+      needUpdate = true;
+    }
+
+    // 检查 hw.cpu.ncore
+    if (config['hw.cpu.ncore'] && typeof config['hw.cpu.ncore'] === 'number' && config['hw.cpu.ncore'] > 2) {
+      needUpdate = true;
+      config['hw.cpu.ncore'] = 2;
     }
 
     // 检查镜像路径
-    if (config['image.sysdir.2']?.includes('.export_dev/system-images')) {
+    if (config['image.sysdir.2'] && normalizePath(config['image.sysdir.2'].toString())?.includes('.export_dev/system-images')) {
       needUpdate = true;
-      config['image.sysdir.2'] = config['image.sysdir.2'].replace('.export_dev/system-images', '.vela/sdk/system-images');
+      config['image.sysdir.2'] = normalizePath(config['image.sysdir.2'].toString()).replace('.export_dev/system-images', '.vela/sdk/system-images');
     }
     if (needUpdate) {
       await _promises.default.writeFile(configIni, (0, _ini.stringify)(config));
@@ -430,7 +453,7 @@ class VvdManager {
     // -fsdev local,security_model=none,id=fsdev0,path=${HOST_9PFS_DIR} \
     // -device virtio-9p-device,id=fs0,fsdev=fsdev0,mount_tag=host `
 
-    const qemuOption = `-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
+    const qemuOption = `-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting -smp 2`;
 
     // qt windows 配置
     // 在 docker，wls，等无界面平台上用 -no-window ,否则用 -qt-hide-window
@@ -452,7 +475,8 @@ class VvdManager {
     const cmd = `${emulatorBin} -vela -avd ${options.vvdName} ${serialStr} -show-kernel ${portMappingStr} ${windowOption} ${grpcStr} ${verboseOption} -qemu ${qemuOption}`;
     const vvdInfo = this.getVvdInfo(vvdName);
     await this.oldEmulatorMigrate(vvdName);
-    if (!vvdInfo.imageDir) {
+    const imageDir = vvdInfo.customImagePath || vvdInfo.imageDir;
+    if (!imageDir) {
       const errMsg = `${vvdName} is not supported`;
       _ColorConsole.default.throw(errMsg);
       throw new Error(errMsg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.6-beta.2",
+  "version": "2.0.6-beta.4",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -23,10 +23,6 @@
     "type": "git",
     "url": ""
   },
-  "author": {
-    "name": "juancao816",
-    "email": "caojuan2019@163.com"
-  },
   "engines": {
     "node": ">=12.0"
   },
@@ -36,10 +32,10 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.2",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.4",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
-    "@miwt/adb": "0.10.1",
+    "@miwt/adb": "0.10.5",
     "adm-zip": "^0.5.16",
     "dayjs": "^1.11.12",
     "find-process": "^1.4.7",
@@ -53,5 +49,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "d0057f9e62ac191d21445787667217cfa4aff1e9"
+  "gitHead": "1acc8279ba3c5995aebe3a97a6b33154086f09d6"
 }

package/lib/vvd/grpc/types/KeyEvent.d.ts

@@ -1,19 +0,0 @@
-export declare enum KeyEventType {
-    KEYDOWN = 0,
-    KEYUP = 1,
-    KEYPRESS = 2
-}
-export declare enum KeyCodeType {
-    USB = 0,
-    EVDEV = 1,
-    XKB = 2,
-    WIN = 3,
-    MAC = 4
-}
-export interface GrpcKeyboardEvent {
-    codeType?: KeyCodeType;
-    eventType?: KeyEventType;
-    keyCode?: number | string;
-    key?: string;
-    text?: string;
-}

package/lib/vvd/grpc/types/KeyEvent.js

@@ -1,20 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.KeyEventType = exports.KeyCodeType = void 0;
-let KeyEventType = exports.KeyEventType = /*#__PURE__*/function (KeyEventType) {
-  KeyEventType[KeyEventType["KEYDOWN"] = 0] = "KEYDOWN";
-  KeyEventType[KeyEventType["KEYUP"] = 1] = "KEYUP";
-  KeyEventType[KeyEventType["KEYPRESS"] = 2] = "KEYPRESS";
-  return KeyEventType;
-}({});
-let KeyCodeType = exports.KeyCodeType = /*#__PURE__*/function (KeyCodeType) {
-  KeyCodeType[KeyCodeType["USB"] = 0] = "USB";
-  KeyCodeType[KeyCodeType["EVDEV"] = 1] = "EVDEV";
-  KeyCodeType[KeyCodeType["XKB"] = 2] = "XKB";
-  KeyCodeType[KeyCodeType["WIN"] = 3] = "WIN";
-  KeyCodeType[KeyCodeType["MAC"] = 4] = "MAC";
-  return KeyCodeType;
-}({});

package/lib/vvd/grpc/types/MouseEvent.d.ts

@@ -1,30 +0,0 @@
-export interface MouseEvent {
-    /**
-     * The horizontal coordinate. This is the physical location on the
-     * screen For example 0 indicates the leftmost coordinate.
-     */
-    x?: number;
-    /**
-     * The vertical coordinate. This is the physical location on the screen
-     * For example 0 indicates the top left coordinate.
-     */
-    y?: number;
-    /**
-     * Indicates which buttons are pressed.
-     * 0: No button was pressed
-     * 1: Primary button (left)
-     * 2: Secondary button (right)
-     */
-    buttons?: number;
-    /**
-     * The display device where the mouse event occurred.
-     * Omitting or using the value 0 indicates the main display.
-     */
-    display?: number;
-}
-export interface MouseEventOutput {
-    x: number;
-    y: number;
-    buttons: number;
-    display: number;
-}