@aiot-toolkit/emulator 2.0.5-widget-provider-beta.2 → 2.0.6-beta.1

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'];
@@ -62,13 +79,13 @@ class VvdManager {
     return _path.default.resolve(__dirname, '../static/debugger_ip.cfg');
   }
 
-  /**
-   * 创建Vela端的 VVD ，统一保存在 .vela/vvd 目录下
-   * 1. 创建.vela/advancedFeatures.ini文件
-   * 2. 创建.vela/vvd/${avdName}.ini文件
-   * 3. 创建.vela/vvd/${avdName}.vvd/config.ini文件
-   * @param vvdParams VVD参数，宽高、绑定的镜像路径等
-   * @returns
+  /**
+   * 创建Vela端的 VVD ，统一保存在 .vela/vvd 目录下
+   * 1. 创建.vela/advancedFeatures.ini文件
+   * 2. 创建.vela/vvd/${avdName}.ini文件
+   * 3. 创建.vela/vvd/${avdName}.vvd/config.ini文件
+   * @param vvdParams VVD参数，宽高、绑定的镜像路径等
+   * @returns
    */
   createVvd(vvdParams) {
     const {
@@ -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);
@@ -394,12 +467,14 @@ class VvdManager {
       } else continue;
       if (!_fs.default.existsSync(pOfVvd)) {
         // 文件不存在则直接复制
+        _ColorConsole.default.log(`${file} not found, copy from ${pOfImageDir}`);
         _fs.default.copyFileSync(pOfImageDir, pOfVvd);
       } else {
         // 文件存在但过时
         const statsInAvd = _fs.default.statSync(pOfVvd);
         const stats = _fs.default.statSync(pOfImageDir);
         if ((0, _dayjs.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
+          _ColorConsole.default.log(`${file} file is outdate, update from ${pOfImageDir}`);
           _fs.default.copyFileSync(pOfImageDir, pOfVvd);
         }
       }
@@ -448,7 +523,8 @@ class VvdManager {
       return {
         coldBoot: false,
         emulatorInstance,
-        getAgent: () => (0, _grpc.createGrpcClient)(e)
+        getAgent: () => (0, _grpc.createGrpcClient)(e),
+        grpcConfig: e
       };
     }
 
@@ -471,10 +547,9 @@ class VvdManager {
 
       // 利用 readline 接口可解决子进程日志换行的问题
       const readlines = (0, _logcat.attachReadline)(emulatorProcess, onStdout, onErrout);
-      const emulatorStartedHandler = async msg => {
+      const emulatorStartedHandler = msg => {
         if (func(msg)) {
-          const runningVvds = await (0, _emulatorutil.getRunningVvds)();
-          const e = runningVvds.find(e => e['avd.id'] === vvdName);
+          const e = (0, _emulatorutil.getRunningAvdConfigByName)(vvdName);
           if (e) {
             const emulatorInstance = (0, _instance.findInstance)(vvdInfo.imageType, {
               serialPort: e['port.serial'],
@@ -491,7 +566,8 @@ class VvdManager {
             resolve({
               coldBoot: true,
               emulatorInstance,
-              getAgent: () => (0, _grpc.createGrpcClient)(e)
+              getAgent: () => (0, _grpc.createGrpcClient)(e),
+              grpcConfig: e
             });
           } else {
             reject('get emulator running config failed');
@@ -663,31 +739,31 @@ class VvdManager {
     }
   }
 
-  /**
-   * 下载 SDK，默认只下载需要更新的部分
-   * @param opt.force 强制下载所有部分
-   *
-   * @example
-   * async function main() {
-   * const sdkHome = path.resolve(os.homedir(), '.export_dev1')
-   * const velaAvdCls = new VelaAvdCls({ sdkHome })
-   *
-   * const downloder = await velaAvdCls.downloadSDK({
-   *  force: true,
-   *   cliProgress: false,
-   *   parallelDownloads: 6
-   * })
-   *
-   * downloder.on('progress', (progress) => {
-   *  console.log(
-   *    `progress: ${progress.formattedSpeed} ${progress.formattedPercentage} ${progress.formatTotal} ${progress.formatTimeLeft}`
-   *  )
-   * })
-   *
-   * await downloder.downlodPromise
-   *
-   * console.log('download success')
-   * }
+  /**
+   * 下载 SDK，默认只下载需要更新的部分
+   * @param opt.force 强制下载所有部分
+   *
+   * @example
+   * async function main() {
+   * const sdkHome = path.resolve(os.homedir(), '.export_dev1')
+   * const velaAvdCls = new VelaAvdCls({ sdkHome })
+   *
+   * const downloder = await velaAvdCls.downloadSDK({
+   *  force: true,
+   *   cliProgress: false,
+   *   parallelDownloads: 6
+   * })
+   *
+   * downloder.on('progress', (progress) => {
+   *  console.log(
+   *    `progress: ${progress.formattedSpeed} ${progress.formattedPercentage} ${progress.formatTotal} ${progress.formatTimeLeft}`
+   *  )
+   * })
+   *
+   * await downloder.downlodPromise
+   *
+   * console.log('download success')
+   * }
    */
   async downloadSDK(opt) {
     const updateList = opt.force ? Object.values(_Vvd.SDKParts) : await this.hasSDKPartUpdate();
@@ -744,6 +820,10 @@ class VvdManager {
         zip.extractAllTo(targetDir, true, true);
         await _fs.default.promises.rm(zipFile, {
           force: true
+        }).catch(e => {
+          _ColorConsole.default.info(`remove ${zipFile} failed: ${e}`);
+          // my be failed on windows as resource busy or locked, don't care
+          return Promise.resolve();
         });
       }
       const verFile = this.getSDKVersionPath();
@@ -773,6 +853,10 @@ class VvdManager {
       zip.extractAllTo(_path.default.resolve(this.sdkHome, _Vvd.SDKParts.SYSTEM_IMAGES, imageId), true, true);
       await _fs.default.promises.rm(zipFile, {
         force: true
+      }).catch(e => {
+        _ColorConsole.default.info(`remove ${zipFile} failed: ${e}`);
+        // my be failed on windows as resource busy or locked, don't care
+        return Promise.resolve();
       });
     });
     return Object.assign(downloader, {

package/lib/vvd/logcat.js

@@ -27,7 +27,7 @@ function attachReadline(p, onStdout, onErrout) {
   let stderrReadline;
 
   // 利用 readline 接口可解决子进程日志换行的问题
-  if (p.stdout) {
+  if (p?.stdout) {
     stdoutReadline = _readline.default.createInterface({
       input: p.stdout
     });
@@ -39,7 +39,7 @@ function attachReadline(p, onStdout, onErrout) {
       stdoutReadline = undefined;
     });
   }
-  if (p.stderr) {
+  if (p?.stderr) {
     stderrReadline = _readline.default.createInterface({
       input: p.stderr
     });
@@ -59,7 +59,7 @@ function attachReadline(p, onStdout, onErrout) {
     stdoutReadline = undefined;
     stderrReadline = undefined;
   }
-  p.on('exit', () => {
+  p?.on('exit', () => {
     dispose();
   });
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.5-widget-provider-beta.2",
+  "version": "2.0.6-beta.1",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,7 +36,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.5-widget-provider-beta.2",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.1",
     "@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": "4a8894bc66a9c78cd835ed6c1af74d054300e064"
+  "gitHead": "892743ccc51408960e6cee86675538501b3e47f1"
 }