@aiot-toolkit/emulator 2.0.5-beta.23 → 2.0.5-beta.24

package/lib/emulatorutil/constants.js

@@ -57,14 +57,14 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
   label: 'vela-miwear-watch-5.0',
   description: '适用于手表/手环的，带表盘的 vela 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5,
-  time: '20250626',
+  time: '20250716',
   hide: false,
   icon: ''
 }, {
   label: 'vela-watch-5.0',
   description: '适用于手表/手环的，不带表盘的 vela 5.0 镜像，可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_WATCH_5,
-  time: '20250626',
+  time: '20250716',
   hide: false,
   icon: ''
 }, {
@@ -93,7 +93,7 @@ const EmulatorEnvVersion = exports.EmulatorEnvVersion = {
   name: '模拟器资源版本管理',
   [_Vvd.SDKParts.EMULATOR]: '0.1.0',
   [_Vvd.SDKParts.QA]: '0.0.1',
-  [_Vvd.SDKParts.SKINS]: '0.0.9',
+  [_Vvd.SDKParts.SKINS]: '0.0.10',
   [_Vvd.SDKParts.SYSTEM_IMAGES]: VelaImageVersionList[0].time,
   [_Vvd.SDKParts.MODEM_SIMULATOR]: '0.0.3'
 };

package/lib/instance/common.d.ts

@@ -26,7 +26,10 @@ declare abstract class CommonEmulatorInstance {
     logger: (log: string) => void;
     constructor(params: IEmulatorInstanceParams);
     /** 安装应用，留给子类实现 */
-    abstract install(rpkPath: string, packageName: string): Promise<void>;
+    abstract install(rpkPath: string, options?: {
+        packageName?: string;
+        size?: number;
+    }): Promise<void>;
     /** 卸载应用，留给子类实现 */
     abstract uninstall(packageName: string): Promise<void>;
     /** 重启应用 */

package/lib/instance/common.js

@@ -12,6 +12,7 @@ var _utils = require("../utils");
 var _logcat = require("../vvd/logcat");
 var _emulatorutil = require("../emulatorutil");
 var _shared = require("../shared");
+var _fs = _interopRequireDefault(require("fs"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -120,7 +121,10 @@ class CommonEmulatorInstance {
   async pushAndInstall(rpkPath, appName) {
     const targetPath = await this.pushRpk(rpkPath, appName);
     try {
-      await this.install(targetPath, appName);
+      await this.install(targetPath, {
+        packageName: appName,
+        size: _fs.default.statSync(rpkPath).size
+      });
     } catch (error) {
       let timer;
       if (error === _shared.RpkInstallFailedReason.Busy) {
@@ -128,7 +132,7 @@ class CommonEmulatorInstance {
         await new Promise((resolve, rejcet) => {
           timer = setTimeout(() => {
             this.pushAndInstall(rpkPath, appName).then(resolve).catch(rejcet);
-          }, 5000);
+          }, 3000);
         });
       } else {
         clearTimeout(timer);

package/lib/instance/dev.d.ts

@@ -9,7 +9,10 @@ declare class GoldfishInstance extends CommonEmulatorInstance {
     imageType: VelaImageType;
     static appDir: string;
     static emulatorStartedFlag: RegExp;
-    install(rpkPath: string, appPackageName?: string): Promise<void>;
+    install(rpkPath: string, opt: {
+        packageName?: string;
+        size?: number;
+    }): Promise<void>;
     /**
      * 在模拟器中启动快应用
      * 通过vapp命令启动，调试时需额外配置--jsdebugger参数

package/lib/instance/dev.js

@@ -23,10 +23,10 @@ class GoldfishInstance extends _common.default {
   imageType = (() => _Vvd.VelaImageType.DEV)();
   static appDir = '/data/app';
   static emulatorStartedFlag = /(NSH)/;
-  async install(rpkPath, appPackageName) {
+  async install(rpkPath, opt) {
     // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
-    rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;
-    const targetPath = `${this.appDir}/${appPackageName}`;
+    rpkPath = rpkPath || `${this.appDir}/${opt.packageName}.rpk`;
+    const targetPath = `${this.appDir}/${opt.packageName}`;
     const mkdirCmd = `adb -s ${this.sn} shell mkdir ${targetPath}`;
     this.logger(`Excuting: ${mkdirCmd}`);
     await adbMiwt.execAdbCmdAsync(mkdirCmd);

package/lib/instance/miwear.d.ts

@@ -14,7 +14,10 @@ declare class MiwearInstance extends CommonEmulatorInstance {
      * 使用 pm 安装快应用
      * @param targeRpk 快应用的rpk文件路径
      */
-    install(targeRpk: string): Promise<void>;
+    install(targeRpk: string, options?: {
+        packageName?: string;
+        size?: number;
+    }): Promise<void>;
     /**
      * 使用 pm 卸载快应用
      * @param packageName 快应用的包名

package/lib/instance/miwear.js

@@ -32,7 +32,7 @@ class MiwearInstance extends _common.default {
    * 使用 pm 安装快应用
    * @param targeRpk 快应用的rpk文件路径
    */
-  async install(targeRpk) {
+  async install(targeRpk, options) {
     const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
     this.logger(`Excuting: ${installCmd}`);
     adbMiwt.execAdbCmd(installCmd);
@@ -61,11 +61,17 @@ class MiwearInstance extends _common.default {
           reject(_shared.RpkInstallFailedReason.Busy);
         }
       };
+      function getTimeout(size) {
+        if (!size) return 10 * 1000;
+        const mu = size / 1024 / 1024;
+        return mu < 1 ? 10 * 1000 : mu < 4 ? 60 * 1000 : 2 * 60 * 1000;
+      }
+      const timeout = getTimeout(options?.size);
       let timer = setTimeout(() => {
         this.stdoutReadline.off('line', func);
         this.logger(`Install to ${this.vvdName} ${targeRpk} timeout`);
         reject(_shared.RpkInstallFailedReason.Timeout);
-      }, 1 * 60 * 1000);
+      }, timeout);
       this.stdoutReadline.on('line', func);
       this.stdoutReadline.on('close', () => {
         this.stdoutReadline.off('line', func);

package/lib/instance/pre.d.ts

@@ -7,7 +7,10 @@ declare class PreInstance extends CommonEmulatorInstance {
     imageType: VelaImageType;
     appDir: string;
     static emulatorStartedFlag: RegExp;
-    install(rpkPath: string, appPackageName?: string): Promise<void>;
+    install(rpkPath: string, opt: {
+        packageName: string;
+        size?: number;
+    }): Promise<void>;
     uninstall(packageName: string): Promise<void>;
     /**
      * 在模拟器中启动快应用

package/lib/instance/pre.js

@@ -17,10 +17,10 @@ class PreInstance extends _common.default {
   imageType = (() => _Vvd.VelaImageType.PRE)();
   appDir = '/data/quickapp/app';
   static emulatorStartedFlag = /(NSH)/;
-  async install(rpkPath, appPackageName) {
+  async install(rpkPath, opt) {
     // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
-    rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;
-    const targetPath = `${this.appDir}/${appPackageName}`;
+    rpkPath = rpkPath || `${this.appDir}/${opt.packageName}.rpk`;
+    const targetPath = `${this.appDir}/${opt.packageName}`;
     const mkdirCmd = `adb -s ${this.sn} shell mkdir ${targetPath}`;
     this.logger(`Excuting: ${mkdirCmd}`);
     await adbMiwt.execAdbCmdAsync(mkdirCmd);

package/lib/instance/vela5.js

@@ -14,7 +14,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class Vela5Instance extends _miwear.default {
-  static emulatorStartedFlag = /adb_register_service/;
+  static emulatorStartedFlag = /booting completed|Boot completed/;
   static appStartedFlag = /Start main loop/;
   imageType = (() => _Vvd.VelaImageType.VELA_WATCH_5)();
   appDir = '/data/app';

package/lib/static/avdConfigIni.json

@@ -23,10 +23,9 @@
   "hw.lcd.height": 466,
   "hw.lcd.width": 466,
   "hw.mainKeys": "no",
-  "hw.ramSize": 512,
+  "hw.ramSize": 1024,
   "hw.sdCard": "no",
   "hw.sensors.orientation": "yes",
-  "hw.sensors.proximity": "yes",
   "hw.trackBall": "no",
   "image.sysdir.2": "",
   "runtime.network.latency": "none",
@@ -36,11 +35,11 @@
   "skin.name": "",
   "skin.path": "",
   "hw.accelerometer": "yes",
-  "hw.gyroscope ": "yes",
-  "hw.sensors.magnetic_field ": "yes",
-  "hw.sensors.temperature ": "yes",
-  "hw.sensors.proximity ": "yes",
-  "hw.sensors.light ": "yes",
-  "hw.sensors.humidity ": "yes",
-  "hw.sensors.heart_rate ": "yes"
+  "hw.gyroscope": "yes",
+  "hw.sensors.proximity": "yes",
+  "hw.sensors.magnetic_field": "yes",
+  "hw.sensors.temperature": "yes",
+  "hw.sensors.light": "yes",
+  "hw.sensors.humidity": "yes",
+  "hw.sensors.heart_rate": "yes"
 }

package/lib/typing/Vvd.d.ts

@@ -4,8 +4,7 @@ export interface IVvdResourcePaths {
     imageHome?: string;
 }
 export declare enum IVvdArchType {
-    arm = "arm",
-    arm64 = "arm64"
+    arm = "arm"
 }
 export declare enum VelaImageType {
     VELA_MIWEAR_MINISOUND_5 = "vela-miwear-minisound-5.0",
@@ -37,6 +36,7 @@ export interface EmulatorPart {
         height: string;
         x: string;
         y: string;
+        corner_radius: string;
         shape?: string;
         flavor?: string;
         density?: string;

package/lib/typing/Vvd.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.VelaImageType = exports.VELAHOME = exports.SDKParts = exports.IVvdArchType = void 0;
 let IVvdArchType = exports.IVvdArchType = /*#__PURE__*/function (IVvdArchType) {
   IVvdArchType["arm"] = "arm";
-  IVvdArchType["arm64"] = "arm64";
   return IVvdArchType;
 }({});
 let VelaImageType = exports.VelaImageType = /*#__PURE__*/function (VelaImageType) {

package/lib/utils/file.d.ts

@@ -0,0 +1,8 @@
+/**
+ *  @param mode Optional modifiers that specify the behavior of the copy operation. It is possible to create a mask consisting of the bitwise OR of two or more values (e.g. fs.constants.COPYFILE_EXCL | fs.constants.COPYFILE_FICLONE)
+ */
+export declare function copyDir(source: string, target: string, mode?: number): Promise<void>;
+/**
+ *  @param mode Optional modifiers that specify the behavior of the copy operation. It is possible to create a mask consisting of the bitwise OR of two or more values (e.g. fs.constants.COPYFILE_EXCL | fs.constants.COPYFILE_FICLONE)
+ */
+export declare function copyDirSync(source: string, target: string, mode?: number): void;

package/lib/utils/file.js

@@ -1 +1,48 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.copyDir = copyDir;
+exports.copyDirSync = copyDirSync;
+var _path = _interopRequireDefault(require("path"));
+var _promises = _interopRequireDefault(require("fs/promises"));
+var _fs = _interopRequireDefault(require("fs"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ *  @param mode Optional modifiers that specify the behavior of the copy operation. It is possible to create a mask consisting of the bitwise OR of two or more values (e.g. fs.constants.COPYFILE_EXCL | fs.constants.COPYFILE_FICLONE)
+ */
+async function copyDir(source, target, mode) {
+  const entries = await _promises.default.readdir(source, {
+    withFileTypes: true
+  });
+  await _promises.default.mkdir(target, {
+    recursive: true
+  });
+  await Promise.all(entries.map(entry => {
+    const srcPath = _path.default.join(source, entry.name);
+    const destPath = _path.default.join(target, entry.name);
+    return entry.isDirectory() ? copyDir(srcPath, destPath, mode) : _promises.default.copyFile(srcPath, destPath, mode);
+  }));
+}
+
+/**
+ *  @param mode Optional modifiers that specify the behavior of the copy operation. It is possible to create a mask consisting of the bitwise OR of two or more values (e.g. fs.constants.COPYFILE_EXCL | fs.constants.COPYFILE_FICLONE)
+ */
+function copyDirSync(source, target, mode) {
+  _fs.default.mkdirSync(target, {
+    recursive: true
+  });
+  const entries = _fs.default.readdirSync(source, {
+    withFileTypes: true
+  });
+  for (const entry of entries) {
+    const srcPath = _path.default.join(source, entry.name);
+    const destPath = _path.default.join(target, entry.name);
+    if (entry.isDirectory()) {
+      copyDirSync(srcPath, destPath, mode);
+    } else {
+      _fs.default.copyFileSync(srcPath, destPath, mode);
+    }
+  }
+}

package/lib/vvd/index.d.ts

@@ -4,6 +4,7 @@ import { EmulatorConfig } from '../emulatorutil';
 import { findInstance } from '../instance';
 import type { DownloadFileOptions } from 'ipull';
 import GrpcEmulator from './grpc';
+export declare const isHeadlessEnvironment: () => boolean;
 export declare class VvdManager {
     private vvdHome;
     private sdkHome;
@@ -19,7 +20,7 @@ export declare class VvdManager {
      * @returns
      */
     createVvd(vvdParams: IVvdParams): boolean;
-    getVvdDir(vvdName: string): string;
+    getVvdDir(vvdName: string): any;
     /** 根据AVD名字获取模拟器的详细信息 */
     getVvdInfo(vvdName: string): IVvdParams;
     /** 根据名字删除AVD */
@@ -50,6 +51,7 @@ export declare class VvdManager {
     /** 重置自定义的镜像目录  */
     resetImageDir(vvdName: string): void;
     getEmulatorBinPath(sdkHome: string): string;
+    oldEmulatorMigrate(vvdName: string): Promise<void>;
     getVvdStartCmd(options: IStartOptions | IStartWithSerialPort): Promise<string>;
     startVvd(options: IStartOptions | IStartWithSerialPort): Promise<{
         coldBoot: boolean;

package/lib/vvd/index.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VvdManager = void 0;
+exports.isHeadlessEnvironment = exports.VvdManager = void 0;
 var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+var _promises = _interopRequireDefault(require("fs/promises"));
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
@@ -26,6 +27,7 @@ var _logcat = require("./logcat");
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _ILog = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
 var _grpc = require("./grpc");
+var _file = require("../utils/file");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // TODO: 升级构建工具支持 esm @xujunjie
 const getPort = (async () => {
@@ -42,6 +44,21 @@ const EAvdParamsToIni = {
     abiType: 'arm64-v8a'
   }
 };
+const isHeadlessEnvironment = () => {
+  // 检查是否在 Docker 容器中
+  if (_fs.default.existsSync('/.dockerenv')) return true;
+
+  // 检查是否在 WSL 环境中
+  if (process.env.WSL_DISTRO_NAME) return true;
+
+  // 检查是否设置了 DISPLAY 环境变量（Linux）
+  if (process.platform === 'linux' && !process.env.DISPLAY) return true;
+
+  // 检查是否在 CI 环境中
+  if (process.env.CI) return true;
+  return false;
+};
+exports.isHeadlessEnvironment = isHeadlessEnvironment;
 class VvdManager {
   // 需要复制的文件
   binFiles = ['system.img', 'data.img', 'coredump.core', 'vela_data.bin', 'vela_resource.bin', 'vela_system.bin'];
@@ -144,10 +161,13 @@ class VvdManager {
     }
   }
   getVvdDir(vvdName) {
-    // 模拟器有可能在 .vvd 和 .avd 目录下
-    let res = _path.default.resolve(this.vvdHome, `${vvdName}.vvd`);
-    if (!_fs.default.existsSync(res)) res = _path.default.resolve(this.vvdHome, `${vvdName}.avd`);
-    return res;
+    const maybe = [_path.default.join(this.vvdHome, `${vvdName}.ini`), _path.default.join(_os.default.homedir(), '.android', 'avd', `${vvdName}.ini`), _path.default.join(_os.default.homedir(), '.android', 'vvd', `${vvdName}.ini`)];
+    for (const file of maybe) {
+      if (_fs.default.existsSync(file)) {
+        return (0, _ini.parse)(_fs.default.readFileSync(file, 'utf-8')).path;
+      }
+    }
+    throw new Error(`VVD directory for ${vvdName} not found`);
   }
 
   /** 根据AVD名字获取模拟器的详细信息 */
@@ -333,6 +353,54 @@ class VvdManager {
     const emulatorHome = _path.default.resolve(sdkHome, 'emulator');
     return _path.default.resolve(emulatorHome, `${platform}-${arch}`, 'emulator');
   }
+
+  // 旧的模拟器迁移
+  async oldEmulatorMigrate(vvdName) {
+    const configIni = _path.default.join(this.getVvdDir(vvdName), 'config.ini');
+    const contents = await _promises.default.readFile(configIni, 'utf-8');
+    const config = (0, _ini.parse)(contents);
+    let needUpdate = false;
+
+    // 检查 ramsize 调整为 1024
+    if (config['hw.ramSize'] < 1024) {
+      needUpdate = true;
+      config['hw.ramSize'] = 1024;
+    }
+    // 检查皮肤路径
+    if (config['skin.path']?.includes('.export_dev/skins')) {
+      if (config['skin.path'].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');
+        const userSkins = await _promises.default.readdir(oldUserSkinDir, {
+          withFileTypes: true
+        });
+        for (const skin of userSkins) {
+          if (!skin.isDirectory()) continue;
+          const oldSkinPath = _path.default.join(oldUserSkinDir, skin.name);
+          const newSkinPath = _path.default.join(newUserSkinDir, skin.name);
+          if (!_fs.default.existsSync(newSkinPath)) {
+            await _promises.default.mkdir(newSkinPath, {
+              recursive: true
+            });
+          }
+          await (0, _file.copyDir)(oldSkinPath, newSkinPath);
+        }
+      }
+      needUpdate = true;
+      config['skin.path'] = config['skin.path'].replace('.export_dev/skins', '.vela/sdk/skins');
+    }
+
+    // 检查镜像路径
+    if (config['image.sysdir.2']?.includes('.export_dev/system-images')) {
+      needUpdate = true;
+      config['image.sysdir.2'] = config['image.sysdir.2'].replace('.export_dev/system-images', '.vela/sdk/system-images');
+    }
+    if (needUpdate) {
+      await _promises.default.writeFile(configIni, (0, _ini.stringify)(config));
+      _ColorConsole.default.log(`update ${vvdName} config.ini`);
+    }
+  }
   async getVvdStartCmd(options) {
     const vvdName = options.vvdName;
 
@@ -365,7 +433,11 @@ class VvdManager {
     const qemuOption = `-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
 
     // qt windows 配置
-    const windowOption = options.qtHideWindow ? `-no-window` : '';
+    // 在 docker，wls，等无界面平台上用 -no-window ,否则用 -qt-hide-window
+    // 使用 -no-window 时 extended control 不可用
+    // 在无界面平台上必须使用 -no-window 否则会报错 qt `Could not load the Qt platform plugin \"xcb\"
+    const noWindowOption = isHeadlessEnvironment() ? `-no-window` : '-qt-hide-window';
+    const windowOption = options.qtHideWindow ? noWindowOption : '';
     let grpcStr = options.grpcPort ? `-grpc ${options.grpcPort}` : '';
     let serialStr = ``;
     if (options.serialPort) {
@@ -379,6 +451,7 @@ 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 errMsg = `${vvdName} is not supported`;
       _ColorConsole.default.throw(errMsg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.5-beta.23",
+  "version": "2.0.5-beta.24",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,7 +36,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.23",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.24",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
     "@miwt/adb": "0.10.1",
@@ -53,5 +53,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "f4991bcb0dcaab6853597ca07d21a7999649a1cc"
+  "gitHead": "9db5595088ce88b2530a20f9edae156e9026718e"
 }