@aiot-toolkit/emulator 2.0.5-beta.5 → 2.0.5-beta.7

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');
@@ -54,6 +54,20 @@ const systemImageBaseUrl = exports.systemImageBaseUrl = 'https://vela-ide.cnbj3-
  * vela-dev-0.0.4   ： vela 4.0 dev 分支
  */
 const VelaImageVersionList = exports.VelaImageVersionList = [{
+  label: 'vela-miwear-watch-4.0',
+  description: '原 vela-release-4.0 版本,适用于手表/手环的，带表盘的 vela 4.0 镜像，不可自定义模拟器尺寸',
+  value: _Vvd.VelaImageType.REL,
+  time: '20250225',
+  hide: false,
+  icon: ''
+}, {
+  label: 'vela-watch-4.0',
+  description: '原 vela-pre-4.0 版本，适用于手表/手环的，不带表盘的 vela 4.0 镜像，可自定义模拟器尺寸',
+  value: _Vvd.VelaImageType.PRE,
+  time: '20250225',
+  hide: false,
+  icon: ''
+}, {
   label: 'vela-miwear-watch-5.0',
   description: '适用于手表/手环的，带表盘的 vela 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5,
@@ -68,17 +82,10 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
   hide: false,
   icon: ''
 }, {
-  label: 'vela-miwear-watch-4.0',
-  description: '原 vela-release-4.0 版本,适用于手表/手环的，带表盘的 vela 4.0 镜像，不可自定义模拟器尺寸',
-  value: _Vvd.VelaImageType.REL,
-  time: '20250225',
-  hide: false,
-  icon: ''
-}, {
-  label: 'vela-watch-4.0',
-  description: '原 vela-pre-4.0 版本，适用于手表/手环的，不带表盘的 vela 4.0 镜像，可自定义模拟器尺寸',
-  value: _Vvd.VelaImageType.PRE,
-  time: '20250225',
+  label: 'vela-miwear-minisound-5.0',
+  description: '适用于音响的 vela-miwear 5.0 镜像，不可自定义模拟器尺寸',
+  value: _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5,
+  time: '20250318',
   hide: false,
   icon: ''
 }];

package/lib/instance/common.js

@@ -16,7 +16,7 @@ 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 appUninstalledFlag = /uninstalled app/;
   static appStartedFlag = /Start App loop/;

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/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/typing/Vvd.d.ts

@@ -8,6 +8,7 @@ export declare enum IVvdArchType {
     arm64 = "arm64"
 }
 export declare enum VelaImageType {
+    VELA_MIWEAR_MINISOUND_5 = "vela-miwear-minisound-5.0",
     VELA_MIWEAR_WATCH_5 = "vela-miwear-watch-5.0",
     VELA_WATCH_5 = "vela-watch-5.0",
     REL = "vela-release-4.0",

package/lib/typing/Vvd.js

@@ -10,6 +10,7 @@ let IVvdArchType = exports.IVvdArchType = /*#__PURE__*/function (IVvdArchType) {
   return IVvdArchType;
 }({});
 let VelaImageType = exports.VelaImageType = /*#__PURE__*/function (VelaImageType) {
+  VelaImageType["VELA_MIWEAR_MINISOUND_5"] = "vela-miwear-minisound-5.0";
   VelaImageType["VELA_MIWEAR_WATCH_5"] = "vela-miwear-watch-5.0";
   VelaImageType["VELA_WATCH_5"] = "vela-watch-5.0";
   VelaImageType["REL"] = "vela-release-4.0";

package/lib/vvd/index.js

@@ -383,11 +383,14 @@ class VvdManager {
       _ColorConsole.default.throw(errMsg);
       throw new Error(errMsg);
     }
-    const imageDir = _path.default.resolve(vvdInfo.customImagePath || vvdInfo.imageDir);
     for (const file of this.binFiles) {
       const pOfVvd = _path.default.join(vvdDir, file);
-      const pOfImageDir = _path.default.join(imageDir, file);
-      if (!_fs.default.existsSync(pOfImageDir)) continue;
+      let pOfImageDir;
+      if (vvdInfo.customImagePath && _fs.default.existsSync(_path.default.join(vvdInfo.customImagePath, file))) {
+        pOfImageDir = _path.default.join(vvdInfo.customImagePath, file);
+      } else if (vvdInfo.imageDir && _fs.default.existsSync(_path.default.join(vvdInfo.imageDir, file))) {
+        pOfImageDir = _path.default.join(vvdInfo.imageDir, file);
+      } else continue;
       if (!_fs.default.existsSync(pOfVvd)) {
         // 文件不存在则直接复制
         _fs.default.copyFileSync(pOfImageDir, pOfVvd);
@@ -465,7 +468,8 @@ class VvdManager {
       }
 
       // 利用 readline 接口可解决子进程日志换行的问题
-      const readlines = (0, _logcat.attachReadline)(emulatorProcess, async msg => {
+      const readlines = (0, _logcat.attachReadline)(emulatorProcess, onStdout, onErrout);
+      const emulatorStartedHandler = async msg => {
         if (func(msg)) {
           const runningVvds = await (0, _emulatorutil.getRunningVvds)();
           const e = runningVvds.find(e => e['avd.id'] === vvdName);
@@ -481,6 +485,7 @@ class VvdManager {
               customLogger: options.customLogger
             });
             logger(`${options.vvdName} started successfully`);
+            readlines.stdoutReadline.off('line', emulatorStartedHandler);
             resolve({
               coldBoot: true,
               emulatorInstance
@@ -489,8 +494,8 @@ class VvdManager {
             reject('get emulator running config failed');
           }
         }
-        onStdout(msg);
-      }, onErrout);
+      };
+      readlines.stdoutReadline.on('line', emulatorStartedHandler);
 
       // 监听模拟器的退出事件
       emulatorProcess.on('exit', code => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.5-beta.5",
+  "version": "2.0.5-beta.7",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,7 +36,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.5",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.7",
     "@miwt/adb": "^0.9.0",
     "adm-zip": "^0.5.16",
     "dayjs": "^1.11.12",
@@ -51,5 +51,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "c90b16e8706edad7825777a1b40d367b28d76ed3"
+  "gitHead": "553c62c29e7ddde9cf12fe8ce3801d77bf5e0fcb"
 }