@aiot-toolkit/emulator 2.0.5-beta.2 → 2.0.5-beta.20

package/README.md

@@ -17,101 +17,134 @@ Vela 模拟器 SDK
 ## 安装
 
 ```bash
-npm install @aiot/emulator
+npm install @aiot-toolkit/emulator
 ```
 
 ## 使用
 
-### 创建 VVD
+### 初始化环境
 
 ```ts
 import os from 'os'
 import path from 'path'
-import { IAvdArchType, VelaAvdCls, VelaImageType } from '@aiot/emulator'
+import { VvdManager } from '@aiot-toolkit/emulator'
 
-const sdkHome = path.resolve(os.homedir(), '.export_dev')
-const velaAvdCls = new VelaAvdCls({ sdkHome })
+async function main() {
+  const sdkHome = path.resolve(os.homedir(), '.export_dev')
+  const velaAvdCls = new VvdManager({ sdkHome })
 
-/** 创建一个 466 × 466 带 miwear 的模拟器 */
-export async function createVVd() {
-  velaAvdCls.createVvd({
-    avdName: 'test',
-    avdArch: IAvdArchType.arm64,
-    avdHeight: '466',
-    avdWidth: '466',
-    imageType: VelaImageType.REL
+  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')
 }
+
+main()
 ```
 
-### 启动 VVD
+### 创建 VVD
 
 ```ts
 import os from 'os'
 import path from 'path'
-import { IAvdArchType, VelaAvdCls, VelaImageType } from '../src'
+import { IAvdArchType, VvdManager, VelaImageType, getDefaultImage } from '@aiot-toolkit/emulator'
 
-const sdkHome = path.resolve(os.homedir(), '.export_dev')
-const velaAvdCls = new VelaAvdCls({ sdkHome })
+const velaAvdCls = new VvdManager({
+  sdkHome: path.resolve(os.homedir(), '.export_dev')
+})
 
-export async function startVvd(vvdName: string) {
-  velaAvdCls.startVvd({
-    avdName: vvdName
+/** 创建一个 466 × 466 带 miwear 的模拟器 */
+export async function createVVd() {
+  const defaultImage = getDefaultImage()
+  velaAvdCls.createVvd({
+    name: avdName,
+    imageType: defaultImage,
+    arch: IVvdArchType.arm,
+    imageDir: path.dirname(velaAvdCls.getLocalSystemPath(defaultImage)),
+    width: '466',
+    height: '466'
   })
 }
 ```
 
-### 初始化环境
+### 启动 VVD
 
 ```ts
 import os from 'os'
 import path from 'path'
-import { VelaAvdCls } from '@aiot/emulator'
+import { IAvdArchType, VvdManager, VelaImageType } from '@aiot-toolkit/emulator'
 
-async function main() {
-  const sdkHome = path.resolve(os.homedir(), '.export_dev')
-  const velaAvdCls = new VelaAvdCls({ sdkHome })
+const velaAvdCls = new VvdManager({
+  sdkHome: path.resolve(os.homedir(), '.export_dev')
+})
 
-  const downloder = await velaAvdCls.downloadSDK({
-    force: true,
-    cliProgress: false,
-    parallelDownloads: 6
+export async function startVvd(vvdName: string) {
+  /**
+   * coldBoot:boolean 是否冷启动
+   * emulatorInstance: EmulatorInstance 模拟器实例, 可以通过它与模拟器进行命令交互
+   * getAgent: () => Promise<GrpcEmulator> 获取模拟器的Agent，可以通过它与模拟器进行屏幕交互
+   */
+  const { coldBoot, emulatorInstance, getAgent } = await velaAvdCls.startVvd({
+    vvdName
   })
 
-  downloder.on('progress', (progress) => {
-    console.log(
-      `progress: ${progress.formattedSpeed} ${progress.formattedPercentage} ${progress.formatTotal} ${progress.formatTimeLeft}`
-    )
+  // 启动应用
+  emulatorInstance.startApp('com.xiaomi.mipicks')
+
+  const velaAgent = await getAgent()
+  // 获取模拟器截图
+  const imgBuffer = await velaAgent.getScreenshot()
+  // 点击模拟器指定位置,
+  await velaAgent.sendMouse({
+    x: 100,
+    y: 100,
+    // 按下
+    buttons: 1
+  })
+  await velaAgent.sendMouse({
+    x: 100,
+    y: 100,
+    // 松开
+    buttons: 0
   })
-
-  await downloder.downlodPromise
-
-  console.log('download success')
 }
-
-main()
 ```
 
 ### 完整示例
 
 ```ts
 // 安装 npm install @aiot/emulator
-import { IAvdArchType, VelaAvdCls, VelaImageType } from '@aiot/emulator'
+import os from 'os'
+import path from 'path'
+import { IAvdArchType, VvdManager, VelaImageType } from '@aiot-toolkit/emulator'
 
-const velaAvdCls = new VelaAvdCls({})
+const velaAvdCls = new VvdManager({
+  sdkHome: path.resolve(os.homedir(), '.export_dev')
+})
 
 /** 创建一个 466 × 466 带 miwear 的模拟器 */
 velaAvdCls.createVvd({
-  avdName: 'O62',
-  avdArch: IAvdArchType.arm64,
-  avdHeight: '466',
-  avdWidth: '466',
+  name: 'O62',
+  arch: IAvdArchType.arm64,
+  height: '466',
+  width: '466',
   imageType: VelaImageType.REL
 })
 
 /** 启动名为 'O62' 的模拟器 */
 velaAvdCls.startVvd({
-  avdName: 'O62'
+  vvdName: 'O62'
 })
 
 export async function startVvd(vvdName: string) {}

package/lib/emulatorutil/constants.js

@@ -33,7 +33,7 @@ var _shared = require("../shared");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const defaultSDKHome = exports.defaultSDKHome = _path.default.resolve(_os.default.homedir(), _Vvd.VELAHOME.SDK);
 const defaultVvdHome = exports.defaultVvdHome = _path.default.resolve(_os.default.homedir(), _Vvd.VELAHOME.VVD);
-const defaultImageHome = exports.defaultImageHome = _path.default.resolve(defaultSDKHome, 'system-images/arm');
+const defaultImageHome = exports.defaultImageHome = _path.default.resolve(defaultSDKHome, 'system-images', (0, _shared.getDefaultImage)());
 const defaultEmulatorHome = exports.defaultEmulatorHome = _path.default.resolve(defaultSDKHome, 'emulator');
 const defaultSkinHome = exports.defaultSkinHome = _path.default.resolve(defaultSDKHome, 'skins');
 const defaultQuickappHome = exports.defaultQuickappHome = _path.default.resolve(defaultSDKHome, 'qa');
@@ -57,21 +57,21 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
   label: 'vela-miwear-watch-5.0',
   description: '适用于手表/手环的，带表盘的 vela 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5,
-  time: '20250225',
+  time: '20250612',
   hide: false,
   icon: ''
 }, {
   label: 'vela-watch-5.0',
   description: '适用于手表/手环的，不带表盘的 vela 5.0 镜像，可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_WATCH_5,
-  time: '20250225',
+  time: '20250612',
   hide: false,
   icon: ''
 }, {
   label: 'vela-miwear-watch-4.0',
   description: '原 vela-release-4.0 版本,适用于手表/手环的，带表盘的 vela 4.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.REL,
-  time: '20250225',
+  time: '20250526',
   hide: false,
   icon: ''
 }, {
@@ -81,6 +81,13 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
   time: '20250225',
   hide: false,
   icon: ''
+}, {
+  label: 'vela-miwear-minisound-5.0',
+  description: '适用于音响的 vela-miwear 5.0 镜像，不可自定义模拟器尺寸',
+  value: _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5,
+  time: '20250318',
+  hide: true,
+  icon: ''
 }];
 const EmulatorEnvVersion = exports.EmulatorEnvVersion = {
   name: '模拟器资源版本管理',

package/lib/emulatorutil/running.js

@@ -72,8 +72,8 @@ function resolvePath(filePath) {
   return _path.default.resolve(filePath);
 }
 function getRunningAvdConfigFiles() {
-  const dir = getEmulatorDefaultConfigDir();
   try {
+    const dir = getEmulatorDefaultConfigDir();
     const files = _fs.default.readdirSync(dir);
     return files.filter(t => fileNamePattern.test(t)).map(t => _path.default.join(dir, t));
   } catch (error) {

package/lib/instance/common.d.ts

@@ -7,9 +7,11 @@ declare abstract class CommonEmulatorInstance {
     appDir: string;
     static emulatorStartedFlag: RegExp;
     static appInstalledFlag: RegExp;
+    static appInstallFailedFlag: RegExp;
     static appUninstalledFlag: RegExp;
     static appStartedFlag: RegExp;
     static isAppInstalled(log: string): boolean;
+    static isAppInstallFailed(log: string): boolean;
     static isAppUninstalled(log: string, packageName: string): boolean;
     static isEmulatorStarted(log: string): boolean;
     sn: string;
@@ -33,7 +35,7 @@ declare abstract class CommonEmulatorInstance {
     abstract closeApp(appName: string): Promise<void>;
     /** 启动应用，留给子类实现 */
     abstract startApp(packageName: string, debug: boolean): Promise<void>;
-    /** 推送指定文件 */
+    /** 推送指定文件,返回推送结果 */
     push(sourcePath: string, targetPath: string): Promise<string>;
     unzip(zipPath: string, targetPath: string): Promise<void>;
     /** 推送指定 rpk */

package/lib/instance/common.js

@@ -16,13 +16,17 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class CommonEmulatorInstance {
   appDir = '/data/quickapp/app';
-  static emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done|booting completed/;
+  static emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done|booting completed|Boot completed/;
   static appInstalledFlag = /InstallState_Finished|install finished/;
+  static appInstallFailedFlag = /uv_mq_read_cb: install prepare failed/;
   static appUninstalledFlag = /uninstalled app/;
   static appStartedFlag = /Start App loop/;
   static isAppInstalled(log) {
     return this.appInstalledFlag.test(log);
   }
+  static isAppInstallFailed(log) {
+    return this.appInstallFailedFlag.test(log);
+  }
   static isAppUninstalled(log, packageName) {
     return new RegExp(this.appUninstalledFlag + ':\\s+' + packageName).test(log);
   }
@@ -76,14 +80,14 @@ class CommonEmulatorInstance {
 
   /** 启动应用，留给子类实现 */
 
-  /** 推送指定文件 */
+  /** 推送指定文件,返回推送结果 */
   async push(sourcePath, targetPath) {
     // 1. adb push应用的rpk
     const pushCmd = `adb -s ${this.sn} push "${sourcePath}" ${targetPath}`;
     this.logger(`Excuting: ${pushCmd}`);
     const res = await adbMiwt.execAdbCmdAsync(pushCmd);
     this.logger(`Push result: ${res}`);
-    return targetPath;
+    return res;
   }
   async unzip(zipPath, targetPath) {
     const unzipCmd = `adb -s ${this.sn} shell unzip -o ${zipPath} -d ${targetPath}`;
@@ -96,10 +100,7 @@ class CommonEmulatorInstance {
   async pushRpk(rpkPath, appPackageName) {
     // 1. adb push应用的rpk
     const targetPath = `${this.appDir}/${appPackageName}.rpk`;
-    const pushCmd = `adb -s ${this.sn} push "${rpkPath}" ${targetPath}`;
-    this.logger(`Excuting: ${pushCmd}`);
-    const res = await adbMiwt.execAdbCmdAsync(pushCmd);
-    this.logger(`Push ${this.vvdName} rpk result: ${res}`);
+    await this.push(rpkPath, targetPath);
     return targetPath;
   }
 

package/lib/instance/index.d.ts

@@ -6,7 +6,8 @@ import { VelaImageType } from '../typing/Vvd';
 import { IEmulatorInstanceParams } from '../typing/Instance';
 import { Vela5Instance } from './vela5';
 import { VelaMiwear5 } from './miwear5';
-declare function getInstanceClass(imageType: VelaImageType): typeof GoldfishInstance | typeof MiwearInstance | typeof PreInstance | typeof Vela5Instance | typeof VelaMiwear5;
+import { MiniSound5 } from './minisound';
+declare function getInstanceClass(imageType: VelaImageType): typeof GoldfishInstance | typeof MiwearInstance | typeof PreInstance | typeof Vela5Instance | typeof VelaMiwear5 | typeof MiniSound5;
 /**
  * 根据镜像决定使用哪个instance
  * Vela正式版(4.0) -> MiwearInstance

package/lib/instance/index.js

@@ -42,6 +42,7 @@ var _pre = _interopRequireDefault(require("./pre"));
 var _Vvd = require("../typing/Vvd");
 var _vela = require("./vela5");
 var _miwear2 = require("./miwear5");
+var _minisound = require("./minisound");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function getInstanceClass(imageType) {
   const map = {
@@ -49,7 +50,8 @@ function getInstanceClass(imageType) {
     [_Vvd.VelaImageType.REL]: _miwear.default,
     [_Vvd.VelaImageType.DEV]: _dev.default,
     [_Vvd.VelaImageType.VELA_WATCH_5]: _vela.Vela5Instance,
-    [_Vvd.VelaImageType.VELA_MIWEAR_WATCH_5]: _miwear2.VelaMiwear5
+    [_Vvd.VelaImageType.VELA_MIWEAR_WATCH_5]: _miwear2.VelaMiwear5,
+    [_Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5]: _minisound.MiniSound5
   };
   return map[imageType] || _dev.default;
 }

package/lib/instance/minisound.d.ts

@@ -0,0 +1,18 @@
+import { VelaImageType } from '../typing/Vvd';
+import { VelaMiwear5 } from './miwear5';
+export declare class MiniSound5 extends VelaMiwear5 {
+    imageType: VelaImageType;
+    appDir: string;
+    static emulatorStartedFlag: RegExp;
+    static appStartedFlag: RegExp;
+    /**
+     * 使用 pm 安装快应用
+     * @param targeRpk 快应用的rpk文件路径
+     */
+    install(targeRpk: string): Promise<void>;
+    /**
+     * 使用 pm 卸载快应用
+     * @param packageName 快应用的包名
+     */
+    uninstall(packageName: string): Promise<void>;
+}

package/lib/instance/minisound.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MiniSound5 = void 0;
+var _adb = require("@miwt/adb");
+var _Vvd = require("../typing/Vvd");
+var _miwear = require("./miwear5");
+class MiniSound5 extends _miwear.VelaMiwear5 {
+  imageType = (() => _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5)();
+  appDir = '/data/app';
+  static emulatorStartedFlag = /\[launchQuickApp.*\] Start main loop/;
+  static appStartedFlag = /Start main loop/;
+
+  /**
+   * 使用 pm 安装快应用
+   * @param targeRpk 快应用的rpk文件路径
+   */
+  install(targeRpk) {
+    const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
+    this.logger(`Excuting: ${installCmd}`);
+    const res = (0, _adb.execAdbCmdSync)(installCmd);
+    this.logger(`Install Res: ${res}`);
+    if (res.includes('(success 0)')) {
+      return Promise.resolve();
+    } else {
+      return Promise.reject(res);
+    }
+  }
+
+  /**
+   * 使用 pm 卸载快应用
+   * @param packageName 快应用的包名
+   */
+  uninstall(packageName) {
+    const res = (0, _adb.execAdbCmdSync)(`adb -s ${this.sn} shell pm uninstall ${packageName}`);
+    if (res.includes('(success 0)')) {
+      return Promise.resolve();
+    } else {
+      return Promise.reject(res);
+    }
+  }
+}
+exports.MiniSound5 = MiniSound5;

package/lib/instance/miwear.d.ts

@@ -5,6 +5,7 @@ import { VelaImageType } from '../typing/Vvd';
  * 针对 Vela正式版（4.0）的镜像
  */
 declare class MiwearInstance extends CommonEmulatorInstance {
+    static emulatorStartedFlag: RegExp;
     static appInstalledFlag: RegExp;
     imageType: VelaImageType;
     appDir: string;

package/lib/instance/miwear.js

@@ -17,6 +17,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * 针对 Vela正式版（4.0）的镜像
  */
 class MiwearInstance extends _common.default {
+  static emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
   static appInstalledFlag = /InstallState_Finished|install finished/;
   imageType = (() => _Vvd.VelaImageType.REL)();
   appDir = '/data/quickapp/app';
@@ -26,14 +27,23 @@ class MiwearInstance extends _common.default {
    * @param targeRpk 快应用的rpk文件路径
    */
   async install(targeRpk) {
-    adbMiwt.execAdbCmd(`adb -s ${this.sn} shell pm install ${targeRpk}`);
+    const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
+    this.logger(`Excuting: ${installCmd}`);
+    adbMiwt.execAdbCmd(installCmd);
     return new Promise((resolve, reject) => {
       const func = msg => {
         if (MiwearInstance.isAppInstalled(msg)) {
           clearTimeout(timer);
           this.logger(`Install to ${this.vvdName} ${targeRpk} successfully`);
+          this.stdoutReadline.off('line', func);
           resolve();
         }
+        if (MiwearInstance.isAppInstallFailed(msg)) {
+          clearTimeout(timer);
+          this.stdoutReadline.off('line', func);
+          this.logger(`Failed Install to ${this.vvdName} ${targeRpk}`);
+          reject(msg);
+        }
       };
       let timer = setTimeout(() => {
         this.stdoutReadline.off('line', func);
@@ -41,6 +51,11 @@ class MiwearInstance extends _common.default {
         reject('Install timeout');
       }, 2 * 60 * 1000);
       this.stdoutReadline.on('line', func);
+      this.stdoutReadline.on('close', () => {
+        this.stdoutReadline.removeAllListeners();
+        clearTimeout(timer);
+        reject('Device poweroff');
+      });
     });
   }
 

package/lib/instance/miwear5.d.ts

@@ -1,4 +1,7 @@
+import { VelaImageType } from '../typing/Vvd';
 import MiwearInstance from './miwear';
 export declare class VelaMiwear5 extends MiwearInstance {
+    imageType: VelaImageType;
     appDir: string;
+    static emulatorStartedFlag: RegExp;
 }

package/lib/instance/miwear5.js

@@ -4,9 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VelaMiwear5 = void 0;
+var _Vvd = require("../typing/Vvd");
 var _miwear = _interopRequireDefault(require("./miwear"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class VelaMiwear5 extends _miwear.default {
+  imageType = (() => _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5)();
   appDir = '/data/app';
+  static emulatorStartedFlag = /\[App Active Flag/;
 }
 exports.VelaMiwear5 = VelaMiwear5;

package/lib/shared/index.js

@@ -16,7 +16,7 @@ function isVelaImageType(value) {
   return Object.values(_Vvd.VelaImageType).includes(value);
 }
 function isMiwearImageType(val) {
-  return [_Vvd.VelaImageType.REL, _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5].includes(val);
+  return [_Vvd.VelaImageType.REL, _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5, _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5].includes(val);
 }
 function getDefaultImage() {
   return _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5;

package/lib/static/proto/README.MD

@@ -0,0 +1,2 @@
+This contains all the protobuf files that are shipped with the emulator.
+These were taken at sha b5705ca57ad61b81413aca46d82baf5ceeaeed8c