@aiot-toolkit/emulator 2.0.6-beta.1 → 2.0.6-beta.11

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, {
@@ -99,7 +100,8 @@ class VvdManager {
       density,
       imageDir: imagePath = _constants.defaultImageHome,
       customLcdRadius,
-      imageType
+      imageType,
+      marketName
     } = vvdParams;
     const vvdDir = _path.default.resolve(this.vvdHome, `${vvdName}.vvd`);
     const vvdIni = _path.default.resolve(this.vvdHome, `${vvdName}.ini`);
@@ -111,11 +113,11 @@ class VvdManager {
     configIniJson['abi.type'] = abiType;
     configIniJson['avd.ini.displayname'] = vvdName;
     configIniJson['hw.cpu.arch'] = arch;
-    configIniJson['hw.lcd.shape'] = shape;
-    configIniJson['hw.device.flavor'] = flavor;
-    configIniJson['hw.lcd.density'] = density;
-    configIniJson['ide.lcd.radius'] = customLcdRadius;
-    configIniJson['ide.image.type'] = imageType;
+    if (shape) configIniJson['hw.lcd.shape'] = shape;
+    if (flavor) configIniJson['hw.device.flavor'] = flavor;
+    if (density) configIniJson['hw.lcd.density'] = density;
+    if (customLcdRadius) configIniJson['ide.lcd.radius'] = customLcdRadius;
+    if (imageType) configIniJson['ide.image.type'] = imageType;
     if (skin) {
       delete configIniJson['hw.lcd.height'];
       delete configIniJson['hw.lcd.width'];
@@ -129,7 +131,9 @@ class VvdManager {
       delete configIniJson['skin.name'];
       delete configIniJson['skin.path'];
     }
-
+    if (marketName) {
+      configIniJson['product.marketname'] = marketName;
+    }
     // 默认使用 'image.sysdir.2' 自定义使用 'image.sysdir.1'
     configIniJson['image.sysdir.2'] = imagePath;
     try {
@@ -180,8 +184,7 @@ class VvdManager {
       width: '',
       skin: '',
       imageDir: '',
-      customLcdRadius: '',
-      imageType: _Vvd.VelaImageType.REL
+      customLcdRadius: ''
     };
     let currVvdDir = this.getVvdDir(vvdName);
     const configIni = _path.default.resolve(currVvdDir, 'config.ini');
@@ -196,7 +199,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 +241,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 +370,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 +400,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 +455,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 +477,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);
@@ -506,13 +532,33 @@ class VvdManager {
     const onErrout = options.stderrCallback || console.log;
     const e = runningVvds.find(e => e['avd.name'] === vvdName);
     const vvdInfo = this.getVvdInfo(vvdName);
+    const getImageType = async serial => {
+      if (vvdInfo.imageType) return vvdInfo.imageType;
+      // 如果不是通过 IDE 创建的模拟器，没有 imageType 字段，需要智能嗅探镜像类型
+      try {
+        const res = await (0, _adb.execAdbCmdAsync)(`adb -s emulator-${serial} shell uname -a`, {
+          timeout: 3000,
+          encoding: 'utf-8'
+        });
+        if (res.includes('miwear')) {
+          return _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5;
+        }
+        if (res.includes('smartspeaker')) {
+          return _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5;
+        }
+      } catch (error) {
+        return _Vvd.VelaImageType.VELA_WATCH_5;
+      }
+      return _Vvd.VelaImageType.VELA_WATCH_5;
+    };
 
     // 该模拟器已经启动，则创建一个日志流返回
     if (e) {
       // 找出来它原来使用的 debugPort
       const regex = /hostfwd=tcp:(.*?):(\d+)-10\.0\.2\.15:101/;
       const debugPort = e.cmdline?.match(regex)?.[2];
-      const emulatorInstance = (0, _instance.findInstance)(vvdInfo.imageType, {
+      const imageType = await getImageType(e['port.serial']);
+      const emulatorInstance = (0, _instance.findInstance)(imageType, {
         serialPort: e['port.serial'],
         vvdName: vvdName,
         onStdout,
@@ -520,11 +566,16 @@ class VvdManager {
         debugPort,
         customLogger: options.customLogger
       });
+      const velaAgent = (0, _grpc.createGrpcClient)(e);
+      await velaAgent.waitForReady();
+      emulatorInstance.xmsStatus.resolve();
       return {
         coldBoot: false,
         emulatorInstance,
         getAgent: () => (0, _grpc.createGrpcClient)(e),
-        grpcConfig: e
+        grpcConfig: e,
+        velaAgent,
+        imageType
       };
     }
 
@@ -533,65 +584,85 @@ class VvdManager {
     const spawnArgs = cmd.split(' ');
     const spawnBin = spawnArgs.shift();
     logger(`Start CMD: ${cmd}`);
-    const InstanceCalss = (0, _instance.getInstanceClass)(vvdInfo.imageType);
-    const func = InstanceCalss.isEmulatorStarted.bind(InstanceCalss);
-    return new Promise((resolve, reject) => {
-      const emulatorProcess = (0, _child_process.spawn)(spawnBin, spawnArgs, {
-        stdio: 'pipe',
-        shell: true,
-        cwd: this.sdkHome
-      });
-      if (options.origin === _Instance.IStartOrigin.Terminal) {
-        process.stdin.pipe(emulatorProcess.stdin);
-      }
-
-      // 利用 readline 接口可解决子进程日志换行的问题
-      const readlines = (0, _logcat.attachReadline)(emulatorProcess, onStdout, onErrout);
-      const emulatorStartedHandler = msg => {
-        if (func(msg)) {
-          const e = (0, _emulatorutil.getRunningAvdConfigByName)(vvdName);
-          if (e) {
-            const emulatorInstance = (0, _instance.findInstance)(vvdInfo.imageType, {
-              serialPort: e['port.serial'],
-              vvdName: vvdName,
-              logcatProcess: emulatorProcess,
-              ...readlines,
-              onStdout,
-              onErrout,
-              debugPort: options.debugPort,
-              customLogger: options.customLogger
-            });
-            logger(`${options.vvdName} started successfully`);
-            readlines.stdoutReadline.off('line', emulatorStartedHandler);
-            resolve({
-              coldBoot: true,
-              emulatorInstance,
-              getAgent: () => (0, _grpc.createGrpcClient)(e),
-              grpcConfig: e
-            });
+    const {
+      resolve,
+      reject,
+      promise
+    } = Promise.withResolvers();
+    const emulatorProcess = (0, _child_process.spawn)(spawnBin, spawnArgs, {
+      stdio: 'pipe',
+      shell: true,
+      cwd: this.sdkHome
+    });
+    if (options.origin === _Instance.IStartOrigin.Terminal) {
+      process.stdin.pipe(emulatorProcess.stdin);
+    }
+    // 利用 readline 接口可解决子进程日志换行的问题
+    const readlines = (0, _logcat.attachReadline)(emulatorProcess, onStdout, onErrout);
+    const emulatorStartedHandler = async msg => {
+      if (msg.includes('INFO    | Boot completed')) {
+        const e = (0, _emulatorutil.getRunningAvdConfigByName)(vvdName);
+        if (e) {
+          const imageType = await getImageType(e['port.serial']);
+          const emulatorInstance = (0, _instance.findInstance)(imageType, {
+            serialPort: e['port.serial'],
+            vvdName: vvdName,
+            logcatProcess: emulatorProcess,
+            ...readlines,
+            onStdout,
+            onErrout,
+            debugPort: options.debugPort,
+            customLogger: options.customLogger
+          });
+          readlines.stdoutReadline.off('line', emulatorStartedHandler);
+          const velaAgent = (0, _grpc.createGrpcClient)(e);
+          await velaAgent.waitForReady();
+          if (imageType.includes('miwear')) {
+            // 这个时候系统启动成功了，但是 rpk 安装程序还没准备好
+
+            const miwearXmsReadyHander = msg => {
+              const startedFunc = emulatorInstance.isXmsInited.bind(emulatorInstance);
+              if (startedFunc(msg)) {
+                readlines.stdoutReadline.off('line', miwearXmsReadyHander);
+                emulatorInstance.xmsStatus.resolve();
+              }
+            };
+            readlines.stdoutReadline.on('line', miwearXmsReadyHander);
           } else {
-            reject('get emulator running config failed');
+            emulatorInstance.xmsStatus.resolve();
           }
+          logger(`${options.vvdName} started successfully`);
+          resolve({
+            coldBoot: true,
+            emulatorInstance,
+            getAgent: () => (0, _grpc.createGrpcClient)(e),
+            grpcConfig: e,
+            velaAgent,
+            imageType
+          });
+        } else {
+          reject('get emulator running config failed');
         }
-      };
-      readlines.stdoutReadline.on('line', emulatorStartedHandler);
+      }
+    };
+    readlines.stdoutReadline.on('line', emulatorStartedHandler);
 
-      // 监听模拟器的退出事件
-      emulatorProcess.on('exit', code => {
-        logger(`${options.vvdName} emulator exited with code ${code}`);
-        if (options.exitCallback) {
-          options.exitCallback(code);
-        }
-        readlines.dispose();
-        reject();
-      });
+    // 监听模拟器的退出事件
+    emulatorProcess.on('exit', code => {
+      logger(`${options.vvdName} emulator exited with code ${code}`);
+      if (options.exitCallback) {
+        options.exitCallback(code);
+      }
+      readlines.dispose();
+      reject();
+    });
 
-      // 监听模拟器的错误事件
-      emulatorProcess.on('error', err => {
-        readlines.dispose();
-        reject(err);
-      });
+    // 监听模拟器的错误事件
+    emulatorProcess.on('error', err => {
+      readlines.dispose();
+      reject(err);
     });
+    return promise;
   }
   stopVvd(name) {
     let timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10 * 1000;
@@ -767,14 +838,17 @@ class VvdManager {
    */
   async downloadSDK(opt) {
     const updateList = opt.force ? Object.values(_Vvd.SDKParts) : await this.hasSDKPartUpdate();
-    let urls = updateList.map(t => ({
-      name: t,
-      url: (0, _constants.getSDKPartDownloadUrl)(t)
-    }));
+    let urls = [];
+    for (const t of updateList) {
+      urls.push({
+        name: t,
+        url: await (0, _constants.getSDKPartDownloadUrl)(t)
+      });
+    }
     if (opt.imageTypeArr) {
       for (const imgType of opt.imageTypeArr) {
         const needsUpdate = await this.isLocalImageNeedUpdate(imgType);
-        const downloadUrl = (0, _constants.getImageDownloadUrl)()[imgType];
+        const downloadUrl = (await (0, _constants.getImageDownloadUrl)())[imgType];
         // 需要更新并且urls中不存在则添加
         if (needsUpdate && urls.findIndex(u => u.url === downloadUrl) < 0) {
           urls.push({
@@ -836,7 +910,7 @@ class VvdManager {
 
   /** 下载vela系统镜像 */
   async downloadImage(imageId, opt) {
-    const downloadUrls = (0, _constants.getImageDownloadUrl)();
+    const downloadUrls = await (0, _constants.getImageDownloadUrl)();
     const u = downloadUrls[imageId];
     const downloader = await (await ipull).downloadFile({
       url: u,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.6-beta.1",
+  "version": "2.0.6-beta.11",
   "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.1",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.11",
     "@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": "892743ccc51408960e6cee86675538501b3e47f1"
+  "gitHead": "acecf0ae5d6991619051dbbeda770a602f215dd6"
 }

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;
-}