@aiot-toolkit/emulator 2.0.5-alpha.1 → 2.0.5-beta.10

package/lib/emulatorutil/constants.d.ts

@@ -20,6 +20,7 @@ export declare const systemImageBaseUrl = "https://vela-ide.cnbj3-fusion.mi-fds.
  */
 export declare const VelaImageVersionList: {
     label: string;
+    description: string;
     value: VelaImageType;
     time: string;
     hide: boolean;
@@ -41,5 +42,4 @@ export declare function getImageDownloadUrl(): Record<VelaImageType, string>;
  * {@link getImageDownloadUrl}
  */
 export declare function getSDKPartDownloadUrl(type: SDKParts): string;
-export declare function getDefaultImage(): VelaImageType;
-export declare function isVelaImageType(value: any): value is VelaImageType;
+export { isVelaImageType, isMiwearImageType, getDefaultImage } from '../shared';

package/lib/emulatorutil/constants.js

@@ -4,19 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.emulatorBaseUrl = exports.defaultVvdHome = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultSkinHome = exports.defaultSDKHome = exports.defaultQuickappHome = exports.defaultImageHome = exports.defaultEmulatorHome = exports.defaultDebugPort = exports.defaultAdbPort = exports.baseUrl = exports.VelaImageVersionList = exports.EmulatorEnvVersion = void 0;
-exports.getDefaultImage = getDefaultImage;
+Object.defineProperty(exports, "getDefaultImage", {
+  enumerable: true,
+  get: function () {
+    return _shared.getDefaultImage;
+  }
+});
 exports.getImageDownloadUrl = getImageDownloadUrl;
 exports.getSDKPartDownloadUrl = getSDKPartDownloadUrl;
-exports.isVelaImageType = isVelaImageType;
+Object.defineProperty(exports, "isMiwearImageType", {
+  enumerable: true,
+  get: function () {
+    return _shared.isMiwearImageType;
+  }
+});
+Object.defineProperty(exports, "isVelaImageType", {
+  enumerable: true,
+  get: function () {
+    return _shared.isVelaImageType;
+  }
+});
 exports.versionUrl = exports.systemImageBaseUrl = void 0;
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
 var _Vvd = require("../typing/Vvd");
 var _utils = require("../utils");
+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');
@@ -37,35 +54,44 @@ const systemImageBaseUrl = exports.systemImageBaseUrl = 'https://vela-ide.cnbj3-
  * vela-dev-0.0.4   ： vela 4.0 dev 分支
  */
 const VelaImageVersionList = exports.VelaImageVersionList = [{
-  label: 'vela-4.0-正式版',
+  label: 'vela-miwear-watch-4.0',
+  description: '原 vela-release-4.0 版本,适用于手表/手环的，带表盘的 vela 4.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.REL,
-  time: '20241205',
+  time: '20250225',
   hide: false,
   icon: ''
 }, {
-  label: 'vela-4.0-测试版',
+  label: 'vela-watch-4.0',
+  description: '原 vela-pre-4.0 版本，适用于手表/手环的，不带表盘的 vela 4.0 镜像，可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.PRE,
-  time: '20241205',
+  time: '20250225',
   hide: false,
   icon: ''
 }, {
-  label: 'vela-5.0-测试版',
-  value: _Vvd.VelaImageType.VELA_PRE_5,
-  time: '20241107',
-  hide: true,
+  label: 'vela-miwear-watch-5.0',
+  description: '适用于手表/手环的，带表盘的 vela 5.0 镜像，不可自定义模拟器尺寸',
+  value: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5,
+  time: '20250225',
+  hide: false,
   icon: ''
-}
-// {
-//   label: 'vela-dev-开发版',
-//   value: VelaImageType.DEV,
-//   time: '20240712',
-//   hide: true,
-//   icon: ''
-// }
-];
+}, {
+  label: 'vela-watch-5.0',
+  description: '适用于手表/手环的，不带表盘的 vela 5.0 镜像，可自定义模拟器尺寸',
+  value: _Vvd.VelaImageType.VELA_WATCH_5,
+  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: false,
+  icon: ''
+}];
 const EmulatorEnvVersion = exports.EmulatorEnvVersion = {
   name: '模拟器资源版本管理',
-  [_Vvd.SDKParts.EMULATOR]: '0.0.9',
+  [_Vvd.SDKParts.EMULATOR]: '0.1.0',
   [_Vvd.SDKParts.QA]: '0.0.1',
   [_Vvd.SDKParts.SKINS]: '0.0.9',
   [_Vvd.SDKParts.SYSTEM_IMAGES]: VelaImageVersionList[0].time,
@@ -93,16 +119,10 @@ function getSDKPartDownloadUrl(type) {
       let hostOs = systemOs === 'win32' ? 'windows' : systemOs;
       return `${emulatorBaseUrl}/v${EmulatorEnvVersion.emulator}/${hostOs}-${hostArch}.zip`;
     case _Vvd.SDKParts.SYSTEM_IMAGES:
-      return getImageDownloadUrl()[_Vvd.VelaImageType.REL];
+      return getImageDownloadUrl()[(0, _shared.getDefaultImage)()];
     case _Vvd.SDKParts.QA:
     case _Vvd.SDKParts.MODEM_SIMULATOR:
     case _Vvd.SDKParts.SKINS:
       return `${baseUrl}/${type}/v${EmulatorEnvVersion[type]}/${type}.zip`;
   }
-}
-function getDefaultImage() {
-  return _Vvd.VelaImageType.REL;
-}
-function isVelaImageType(value) {
-  return Object.values(_Vvd.VelaImageType).includes(value);
 }

package/lib/instance/common.d.ts

@@ -2,13 +2,15 @@ import readline from 'readline';
 import { IEmulatorInstanceParams } from '../typing/Instance';
 import { VelaImageType } from '../typing/Vvd';
 import { ChildProcessWithoutNullStreams } from 'child_process';
-declare class CommonEmulatorInstance {
+declare abstract class CommonEmulatorInstance {
     imageType: VelaImageType;
     appDir: string;
     static emulatorStartedFlag: RegExp;
     static appInstalledFlag: RegExp;
+    static appUninstalledFlag: RegExp;
     static appStartedFlag: RegExp;
     static isAppInstalled(log: string): boolean;
+    static isAppUninstalled(log: string, packageName: string): boolean;
     static isEmulatorStarted(log: string): boolean;
     sn: string;
     vvdName: string;
@@ -21,6 +23,16 @@ declare class CommonEmulatorInstance {
     logcatProcess: ChildProcessWithoutNullStreams;
     logger: (log: string) => void;
     constructor(params: IEmulatorInstanceParams);
+    /** 安装应用，留给子类实现 */
+    abstract install(rpkPath: string, packageName: string): Promise<void>;
+    /** 卸载应用，留给子类实现 */
+    abstract uninstall(packageName: string): Promise<void>;
+    /** 重启应用 */
+    abstract reloadApp(appName: string, debug?: boolean): Promise<void>;
+    /** 关闭应用 */
+    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>;
@@ -30,17 +42,7 @@ declare class CommonEmulatorInstance {
      * 判断模拟器是否 ready
      */
     isConnected(): Promise<boolean>;
-    /** 安装应用，留给子类实现 */
-    install(rpkPath: string, packageName: string): Promise<void>;
-    /** 卸载应用，留给子类实现 */
-    uninstall(packageName: string): Promise<void>;
-    /** 启动应用，留给子类实现 */
-    startApp(packageName: string, debug?: boolean): Promise<void>;
     pushAndInstall(rpkPath: string, appName: string): Promise<void>;
-    /** 重启应用 */
-    reloadApp(appName: string, debug?: boolean): Promise<void>;
-    /** 关闭应用 */
-    closeApp(appName: string): Promise<void>;
     /** 关闭模拟器 */
     poweroff(timeout?: number): Promise<void>;
     systemed(): Promise<string>;

package/lib/instance/common.js

@@ -16,12 +16,16 @@ 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/;
   static isAppInstalled(log) {
     return this.appInstalledFlag.test(log);
   }
+  static isAppUninstalled(log, packageName) {
+    return new RegExp(this.appUninstalledFlag + ':\\s+' + packageName).test(log);
+  }
   static isEmulatorStarted(log) {
     return this.emulatorStartedFlag.test(log);
   }
@@ -62,6 +66,16 @@ class CommonEmulatorInstance {
     }
   }
 
+  /** 安装应用，留给子类实现 */
+
+  /** 卸载应用，留给子类实现 */
+
+  /** 重启应用 */
+
+  /** 关闭应用 */
+
+  /** 启动应用，留给子类实现 */
+
   /** 推送指定文件 */
   async push(sourcePath, targetPath) {
     // 1. adb push应用的rpk
@@ -100,30 +114,11 @@ class CommonEmulatorInstance {
       return curDev?.status === 'device';
     }, 10, 500);
   }
-
-  /** 安装应用，留给子类实现 */
-  async install(rpkPath, packageName) {}
-
-  /** 卸载应用，留给子类实现 */
-  async uninstall(packageName) {}
-
-  /** 启动应用，留给子类实现 */
-  async startApp(packageName) {
-    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  }
   async pushAndInstall(rpkPath, appName) {
     const targetPath = await this.pushRpk(rpkPath, appName);
     await this.install(targetPath, appName);
   }
 
-  /** 重启应用 */
-  async reloadApp(appName) {
-    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  }
-
-  /** 关闭应用 */
-  async closeApp(appName) {}
-
   /** 关闭模拟器 */
   poweroff() {
     let timeout = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 10 * 1000;

package/lib/instance/dev.d.ts

@@ -1,6 +1,11 @@
 import CommonEmulatorInstance from './common';
 import { VelaImageType } from '../typing/Vvd';
+/**
+ * @deprecated 不在使用
+ */
 declare class GoldfishInstance extends CommonEmulatorInstance {
+    uninstall(): Promise<void>;
+    closeApp(): Promise<void>;
     imageType: VelaImageType;
     static appDir: string;
     static emulatorStartedFlag: RegExp;

package/lib/instance/dev.js

@@ -10,7 +10,16 @@ var _Vvd = require("../typing/Vvd");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
+/**
+ * @deprecated 不在使用
+ */
 class GoldfishInstance extends _common.default {
+  uninstall() {
+    throw new Error('Method not implemented.');
+  }
+  closeApp() {
+    throw new Error('Method not implemented.');
+  }
   imageType = (() => _Vvd.VelaImageType.DEV)();
   static appDir = '/data/app';
   static emulatorStartedFlag = /(NSH)/;

package/lib/instance/index.d.ts

@@ -4,8 +4,10 @@ import MiwearInstance from './miwear';
 import PreInstance from './pre';
 import { VelaImageType } from '../typing/Vvd';
 import { IEmulatorInstanceParams } from '../typing/Instance';
-import { VelaPre5Instance } from './pre5';
-declare function getInstanceClass(imageType: VelaImageType): typeof GoldfishInstance | typeof MiwearInstance | typeof PreInstance | typeof VelaPre5Instance;
+import { Vela5Instance } from './vela5';
+import { VelaMiwear5 } from './miwear5';
+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
@@ -14,4 +16,4 @@ declare function getInstanceClass(imageType: VelaImageType): typeof GoldfishInst
  * Vela开发版（dev)，除0.0.2的其他版本 -> GoldfishInstance
  */
 declare function findInstance(imageType: VelaImageType, params: IEmulatorInstanceParams): CommonEmulatorInstance;
-export { CommonEmulatorInstance as CommonInstance, GoldfishInstance, MiwearInstance, VelaPre5Instance, PreInstance, findInstance, getInstanceClass };
+export { CommonEmulatorInstance as CommonInstance, GoldfishInstance, MiwearInstance, Vela5Instance, PreInstance, findInstance, getInstanceClass };

package/lib/instance/index.js

@@ -27,10 +27,10 @@ Object.defineProperty(exports, "PreInstance", {
     return _pre.default;
   }
 });
-Object.defineProperty(exports, "VelaPre5Instance", {
+Object.defineProperty(exports, "Vela5Instance", {
   enumerable: true,
   get: function () {
-    return _pre2.VelaPre5Instance;
+    return _vela.Vela5Instance;
   }
 });
 exports.findInstance = findInstance;
@@ -40,14 +40,18 @@ var _dev = _interopRequireDefault(require("./dev"));
 var _miwear = _interopRequireDefault(require("./miwear"));
 var _pre = _interopRequireDefault(require("./pre"));
 var _Vvd = require("../typing/Vvd");
-var _pre2 = require("./pre5");
+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 = {
     [_Vvd.VelaImageType.PRE]: _pre.default,
     [_Vvd.VelaImageType.REL]: _miwear.default,
     [_Vvd.VelaImageType.DEV]: _dev.default,
-    [_Vvd.VelaImageType.VELA_PRE_5]: _pre2.VelaPre5Instance
+    [_Vvd.VelaImageType.VELA_WATCH_5]: _vela.Vela5Instance,
+    [_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

@@ -13,10 +13,15 @@ declare class MiwearInstance extends CommonEmulatorInstance {
      * @param targeRpk 快应用的rpk文件路径
      */
     install(targeRpk: string): Promise<void>;
+    /**
+     * 使用 pm 卸载快应用
+     * @param packageName 快应用的包名
+     */
+    uninstall(packageName: string): Promise<void>;
     /** 使用 am start 启动快应用 */
     startApp(packageName: string, debug?: boolean): Promise<void>;
     closeApp(appName: string): Promise<void>;
     reboot(): Promise<void>;
-    reloadApp(appPackageName: string, _debug?: boolean): Promise<void>;
+    reloadApp(appPackageName: string): Promise<void>;
 }
 export default MiwearInstance;

package/lib/instance/miwear.js

@@ -44,6 +44,29 @@ class MiwearInstance extends _common.default {
     });
   }
 
+  /**
+   * 使用 pm 卸载快应用
+   * @param packageName 快应用的包名
+   */
+  uninstall(packageName) {
+    adbMiwt.execAdbCmd(`adb -s ${this.sn} shell pm uninstall ${packageName}`);
+    return new Promise((resolve, reject) => {
+      const func = msg => {
+        if (MiwearInstance.isAppUninstalled(msg, packageName)) {
+          clearTimeout(timer);
+          this.logger(`${this.vvdName} uninstalled ${packageName} successfully`);
+          resolve();
+        }
+      };
+      let timer = setTimeout(() => {
+        this.stdoutReadline.off('line', func);
+        this.logger(`unnstall ${this.vvdName} ${packageName} timeout`);
+        reject('Uninstall timeout');
+      }, 2 * 60 * 1000);
+      this.stdoutReadline.on('line', func);
+    });
+  }
+
   /** 使用 am start 启动快应用 */
   async startApp(packageName) {
     let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -82,7 +105,6 @@ class MiwearInstance extends _common.default {
     });
   }
   async reloadApp(appPackageName) {
-    let _debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     try {
       // 2. 执行am stop和am start命令
       const stopCmd = `adb -s ${this.sn} shell am stop ${appPackageName}`;

package/lib/instance/miwear5.d.ts

@@ -0,0 +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

@@ -0,0 +1,15 @@
+"use strict";
+
+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/instance/pre.d.ts

@@ -1,19 +1,21 @@
-import GoldfishInstance from './dev';
 import { VelaImageType } from '../typing/Vvd';
+import CommonEmulatorInstance from './common';
 /**
  * 不带 miwear 的 4.0 镜像
  */
-declare class PreInstance extends GoldfishInstance {
+declare class PreInstance extends CommonEmulatorInstance {
     imageType: VelaImageType;
     appDir: string;
+    static emulatorStartedFlag: RegExp;
     install(rpkPath: string, appPackageName?: string): Promise<void>;
+    uninstall(packageName: string): Promise<void>;
     /**
      * 在模拟器中启动快应用
      * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
      * @param options
      */
     startApp(packageName: string, debug?: boolean): Promise<void>;
-    closeApp(_appName: string): Promise<void>;
+    closeApp(): Promise<void>;
     reloadApp(appName: string, debug?: boolean): Promise<void>;
 }
 export default PreInstance;

package/lib/instance/pre.js

@@ -4,18 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dev = _interopRequireDefault(require("./dev"));
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
 var _Vvd = require("../typing/Vvd");
+var _common = _interopRequireDefault(require("./common"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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 }; }
 /**
  * 不带 miwear 的 4.0 镜像
  */
-class PreInstance extends _dev.default {
+class PreInstance extends _common.default {
   imageType = (() => _Vvd.VelaImageType.PRE)();
   appDir = '/data/quickapp/app';
+  static emulatorStartedFlag = /(NSH)/;
   async install(rpkPath, appPackageName) {
     // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
     rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;
@@ -27,6 +28,13 @@ class PreInstance extends _dev.default {
     this.logger(`Excuting: ${unzipCmd}`);
     await adbMiwt.execAdbCmdAsync(unzipCmd);
   }
+  async uninstall(packageName) {
+    // 基于 vapp 启动的应用只需要将指定的目录下的文件删除即可
+    const targetPath = `${this.appDir}/${packageName}`;
+    const mkdirCmd = `adb -s ${this.sn} shell rm -r ${targetPath}`;
+    this.logger(`Excuting: ${mkdirCmd}`);
+    await adbMiwt.execAdbCmdAsync(mkdirCmd);
+  }
 
   /**
    * 在模拟器中启动快应用
@@ -49,7 +57,7 @@ class PreInstance extends _dev.default {
       this.logger(`Failed to startup app for ${this.vvdName}: ${e.message}`);
     }
   }
-  async closeApp(_appName) {
+  async closeApp() {
     await this.reboot();
   }
   async reloadApp(appName) {

package/lib/instance/{pre5.d.ts → vela5.d.ts}

@@ -1,6 +1,8 @@
 import { VelaImageType } from '../typing/Vvd';
 import MiwearInstance from './miwear';
-export declare class VelaPre5Instance extends MiwearInstance {
+export declare class Vela5Instance extends MiwearInstance {
+    static emulatorStartedFlag: RegExp;
+    static appStartedFlag: RegExp;
     imageType: VelaImageType;
     appDir: string;
     /**

package/lib/instance/{pre5.js → vela5.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VelaPre5Instance = void 0;
+exports.Vela5Instance = void 0;
 var _Vvd = require("../typing/Vvd");
 var _miwear = _interopRequireDefault(require("./miwear"));
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
@@ -11,8 +11,10 @@ var _util = require("util");
 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 }; }
-class VelaPre5Instance extends _miwear.default {
-  imageType = (() => _Vvd.VelaImageType.VELA_PRE_5)();
+class Vela5Instance extends _miwear.default {
+  static emulatorStartedFlag = /Boot completed/;
+  static appStartedFlag = /Start main loop/;
+  imageType = (() => _Vvd.VelaImageType.VELA_WATCH_5)();
   appDir = '/data/app';
 
   /**
@@ -34,4 +36,4 @@ class VelaPre5Instance extends _miwear.default {
     }
   }
 }
-exports.VelaPre5Instance = VelaPre5Instance;
+exports.Vela5Instance = Vela5Instance;

package/lib/shared/index.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 本文件用于导出一些同构内容，请勿引用非同构内容，例如 nodejs 特性内容，或者 browser 特性内容
+ * @TODO 项目转为 ESM 模块后，可以删除
+ * */
+import { VelaImageType } from '../typing/Vvd';
+export declare function isVelaImageType(value: any): value is VelaImageType;
+export declare function isMiwearImageType(val: VelaImageType): boolean;
+export declare function getDefaultImage(): VelaImageType;

package/lib/shared/index.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultImage = getDefaultImage;
+exports.isMiwearImageType = isMiwearImageType;
+exports.isVelaImageType = isVelaImageType;
+var _Vvd = require("../typing/Vvd");
+/**
+ * 本文件用于导出一些同构内容，请勿引用非同构内容，例如 nodejs 特性内容，或者 browser 特性内容
+ * @TODO 项目转为 ESM 模块后，可以删除
+ * */
+
+function isVelaImageType(value) {
+  return Object.values(_Vvd.VelaImageType).includes(value);
+}
+function isMiwearImageType(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,7 +8,9 @@ export declare enum IVvdArchType {
     arm64 = "arm64"
 }
 export declare enum VelaImageType {
-    VELA_PRE_5 = "vela-pre-5.0",
+    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",
     PRE = "vela-pre-4.0",
     DEV = "vela-dev-0.0.4"
@@ -86,6 +88,7 @@ export interface DownloadItem {
     url: string;
 }
 export interface EmulatorSkin {
+    path: string;
     name: string;
     info: SkinInfo;
     backgroundImage: string;

package/lib/typing/Vvd.js

@@ -10,7 +10,9 @@ let IVvdArchType = exports.IVvdArchType = /*#__PURE__*/function (IVvdArchType) {
   return IVvdArchType;
 }({});
 let VelaImageType = exports.VelaImageType = /*#__PURE__*/function (VelaImageType) {
-  VelaImageType["VELA_PRE_5"] = "vela-pre-5.0";
+  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";
   VelaImageType["PRE"] = "vela-pre-4.0";
   VelaImageType["DEV"] = "vela-dev-0.0.4";

package/lib/vvd/index.d.ts

@@ -5,7 +5,9 @@ import type { DownloadFileOptions } from 'ipull';
 export declare class VvdManager {
     private vvdHome;
     private sdkHome;
+    binFiles: string[];
     constructor(vvdResourcePaths: IVvdResourcePaths);
+    static getDebuggerCfgFile(): string;
     /**
      * 创建Vela端的 VVD ，统一保存在 .vela/vvd 目录下
      * 1. 创建.vela/advancedFeatures.ini文件
@@ -42,7 +44,7 @@ export declare class VvdManager {
         defaultLayout: import("../typing/Vvd").EmulatorLayout;
     }[]>;
     /** 自定义模拟器的镜像目录 */
-    customImageDir(vvdName: string, target: string): void;
+    customImageDir(vvdName: string, target: string): Promise<void>;
     /** 重置自定义的镜像目录  */
     resetImageDir(vvdName: string): void;
     getEmulatorBinPath(sdkHome: string): string;

package/lib/vvd/index.js

@@ -42,6 +42,8 @@ const EAvdParamsToIni = {
   }
 };
 class VvdManager {
+  // 需要复制的文件
+  binFiles = ['system.img', 'data.img', 'coredump.core', 'vela_data.bin', 'vela_resource.bin', 'vela_system.bin'];
   constructor(vvdResourcePaths) {
     const {
       vvdHome: avdHome,
@@ -55,6 +57,9 @@ class VvdManager {
       });
     }
   }
+  static getDebuggerCfgFile() {
+    return _path.default.resolve(__dirname, '../static/debugger_ip.cfg');
+  }
 
   /**
    * 创建Vela端的 VVD ，统一保存在 .vela/vvd 目录下
@@ -282,13 +287,30 @@ class VvdManager {
   }
 
   /** 自定义模拟器的镜像目录 */
-  customImageDir(vvdName, target) {
+  async customImageDir(vvdName, target) {
     const currVvdDir = this.getVvdDir(vvdName);
     const configIni = _path.default.resolve(currVvdDir, 'config.ini');
     const contents = _fs.default.readFileSync(configIni, 'utf-8');
     const config = (0, _ini.parse)(contents);
-    config['image.sysdir.2'] = target;
-    _fs.default.writeFileSync(configIni, (0, _ini.stringify)(config));
+    config['image.sysdir.1'] = target;
+    await _fs.default.promises.writeFile(configIni, (0, _ini.stringify)(config));
+    const defaultImageHome = config['image.sysdir.1'];
+    if (!defaultImageHome) {
+      _ColorConsole.default.warn(`defaultImageHome: ${vvdName} image dir is empty`);
+      return;
+    }
+    // 如果自定义的目录缺少 binFile 则从默认目录复制
+    for (const file of this.binFiles) {
+      const targetFile = _path.default.join(target, file);
+      const originFile = _path.default.join(defaultImageHome, file);
+      if (!_fs.default.existsSync(originFile)) continue;
+      if (!_fs.default.existsSync(targetFile)) {
+        // 文件不存在则直接复制
+        _fs.default.copyFileSync(originFile, targetFile);
+      } else {
+        _ColorConsole.default.warn(`${targetFile} is out-dated,if you want upadte it, please delete it,and use customImageDir again`);
+      }
+    }
   }
 
   /** 重置自定义的镜像目录  */
@@ -297,7 +319,10 @@ class VvdManager {
     const configIni = _path.default.resolve(currVvdDir, 'config.ini');
     const contents = _fs.default.readFileSync(configIni, 'utf-8');
     const config = (0, _ini.parse)(contents);
-    delete config['image.sysdir.2'];
+    const home = this.getSDKPart(_Vvd.SDKParts.SYSTEM_IMAGES);
+    let imageDir = _path.default.resolve(home, config['ide.image.type']);
+    config['image.sysdir.2'] = imageDir;
+    delete config['image.sysdir.1'];
     _fs.default.writeFileSync(configIni, (0, _ini.stringify)(config));
   }
   getEmulatorBinPath(sdkHome) {
@@ -312,6 +337,7 @@ class VvdManager {
 
     // 获取emulator bin的绝对路径
     const emulatorBin = this.getEmulatorBinPath(this.sdkHome);
+    const vvdDir = this.getVvdDir(vvdName);
 
     // 端口映射
     const degbugProt = options.debugPort || (await (await getPort)({
@@ -322,6 +348,19 @@ class VvdManager {
     let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${degbugProt}-10.0.2.15:101`;
 
     // qemu 配置
+    const HOST_9PFS_DIR = _path.default.join(vvdDir, 'share');
+    if (!_fs.default.existsSync(HOST_9PFS_DIR)) {
+      await _fs.default.promises.mkdir(HOST_9PFS_DIR, {
+        recursive: true
+      });
+    }
+    // 9pfs device
+    //     const qemuOption9p = `-netdev user,id=network,net=10.0.2.0/24,dhcpstart=10.0.2.16 \
+    // -device virtio-net-device,netdev=network,bus=virtio-mmio-bus.4 \
+    // -device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting \
+    // -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`;
 
     // qt windows 配置
@@ -344,15 +383,14 @@ class VvdManager {
       _ColorConsole.default.throw(errMsg);
       throw new Error(errMsg);
     }
-
-    // 需要复制的文件
-    const files = ['system.img', 'data.img', 'coredump.core', 'vela_data.bin', 'vela_resource.bin', 'vela_system.bin'];
-    const vvdDir = this.getVvdDir(vvdName);
-    const imageDir = _path.default.resolve(vvdInfo.imageDir);
-    for (const file of files) {
+    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);
@@ -430,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);
@@ -446,6 +485,7 @@ class VvdManager {
               customLogger: options.customLogger
             });
             logger(`${options.vvdName} started successfully`);
+            readlines.stdoutReadline.off('line', emulatorStartedHandler);
             resolve({
               coldBoot: true,
               emulatorInstance
@@ -454,8 +494,8 @@ class VvdManager {
             reject('get emulator running config failed');
           }
         }
-        onStdout(msg);
-      }, onErrout);
+      };
+      readlines.stdoutReadline.on('line', emulatorStartedHandler);
 
       // 监听模拟器的退出事件
       emulatorProcess.on('exit', code => {
@@ -601,7 +641,8 @@ class VvdManager {
           continue;
         }
         if (resouces === _Vvd.SDKParts.SYSTEM_IMAGES) {
-          if (await this.isLocalImageNeedUpdate((0, _constants.getDefaultImage)())) res.push(resouces);
+          const defaultImage = (0, _constants.getDefaultImage)();
+          if (await this.isLocalImageNeedUpdate(defaultImage)) res.push(resouces);
           continue;
         }
         if ((0, _semver.lt)(localVersion[resouces], _constants.EmulatorEnvVersion[resouces])) {
@@ -648,21 +689,17 @@ class VvdManager {
       url: (0, _constants.getSDKPartDownloadUrl)(t)
     }));
     if (opt.imageTypeArr) {
-      // 首先过滤掉 REL 类型
-      const filteredTypes = opt.imageTypeArr.filter(type => type !== _Vvd.VelaImageType.REL);
-
-      // 异步检查每个类型是否需要更新
-      const updateChecks = await Promise.all(filteredTypes.map(async type => ({
-        type,
-        needsUpdate: await this.isLocalImageNeedUpdate(type)
-      })));
-
-      // 过滤和映射
-      const newUrls = updateChecks.filter(item => item.needsUpdate).map(item => ({
-        name: item.type,
-        url: (0, _constants.getImageDownloadUrl)()[item.type]
-      }));
-      urls = urls.concat(newUrls);
+      for (const imgType of opt.imageTypeArr) {
+        const needsUpdate = await this.isLocalImageNeedUpdate(imgType);
+        const downloadUrl = (0, _constants.getImageDownloadUrl)()[imgType];
+        // 需要更新并且urls中不存在则添加
+        if (needsUpdate && urls.findIndex(u => u.url === downloadUrl) < 0) {
+          urls.push({
+            name: imgType,
+            url: downloadUrl
+          });
+        }
+      }
     }
     const downloads = urls.map(async u => {
       const d = await (await ipull).downloadFile({
@@ -681,10 +718,16 @@ class VvdManager {
         return;
       }
       _ColorConsole.default.warn('All file resources have been successfully downloaded and are being decompressed.');
-      for (const u of urls) {
+      for (let u of urls) {
+        // 如果是镜像则来自默认镜像
+        if (u.name === _Vvd.SDKParts.SYSTEM_IMAGES) u.name = (0, _constants.getDefaultImage)();
         // 解压
         const targetDirName = (0, _constants.isVelaImageType)(u.name) ? _Vvd.SDKParts.SYSTEM_IMAGES : u.name;
-        const targetDir = u.name === _Vvd.SDKParts.SYSTEM_IMAGES || (0, _constants.isVelaImageType)(u.name) ? _path.default.resolve(this.sdkHome, targetDirName, _path.default.basename(u.url).replace('.zip', '')) : _path.default.resolve(this.sdkHome, targetDirName);
+        const targetDir = u.name === _Vvd.SDKParts.SYSTEM_IMAGES || (0, _constants.isVelaImageType)(u.name) ?
+        // 镜像解压的目录位于 sdkHome/system_images/imageId
+        _path.default.resolve(this.sdkHome, targetDirName, u.name) :
+        // 其他资源解压的目录位于 sdkHome/resource
+        _path.default.resolve(this.sdkHome, targetDirName);
         const targetDirExist = _fs.default.existsSync(targetDir);
         if (!targetDirExist) await _fs.default.promises.mkdir(targetDir, {
           recursive: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.5-alpha.1",
+  "version": "2.0.5-beta.10",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,7 +36,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.5-alpha.1",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.10",
     "@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": "8c8033a7a52e7cdb83606298ed8c4d6a585ba3ec"
+  "gitHead": "b2403dbd071d5a6ae33b27f49c6f47ba95861477"
 }