@aiot-toolkit/emulator 2.0.5-beta.16 → 2.0.5-beta.18

package/lib/emulatorutil/constants.js

@@ -54,30 +54,30 @@ 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,
-  time: '20250225',
+  time: '20250605',
   hide: false,
   icon: ''
 }, {
   label: 'vela-watch-5.0',
   description: '适用于手表/手环的，不带表盘的 vela 5.0 镜像，可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_WATCH_5,
+  time: '20250605',
+  hide: false,
+  icon: ''
+}, {
+  label: 'vela-miwear-watch-4.0',
+  description: '原 vela-release-4.0 版本,适用于手表/手环的，带表盘的 vela 4.0 镜像，不可自定义模拟器尺寸',
+  value: _Vvd.VelaImageType.REL,
+  time: '20250526',
+  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: ''
@@ -86,7 +86,7 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
   description: '适用于音响的 vela-miwear 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5,
   time: '20250318',
-  hide: false,
+  hide: true,
   icon: ''
 }];
 const EmulatorEnvVersion = exports.EmulatorEnvVersion = {

package/lib/instance/common.d.ts

@@ -35,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

@@ -80,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}`;
@@ -100,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/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,7 +27,9 @@ 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)) {
@@ -48,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/vvd/index.js

@@ -532,7 +532,11 @@ class VvdManager {
       (0, _adb.execAdbCmdAsync)(`adb -s emulator-${config['port.serial']} shell poweroff`).then(() => {
         clearTimeout(t);
         resolve();
-      }).catch(() => {
+      }).catch(e => {
+        if (e?.message?.includes(`device 'emulator-${config['port.serial']}' not found`)) {
+          // 清理之前的文件
+          _fs.default.unlinkSync(config.path);
+        }
         (0, _utils.killProcessByCmd)(config['avd.name']).then(() => {
           clearTimeout(t);
           resolve();

package/lib/vvd/logcat.js

@@ -51,6 +51,9 @@ function attachReadline(p, onStdout, onErrout) {
     });
   }
   function dispose() {
+    p?.removeAllListeners();
+    stdoutReadline?.removeAllListeners();
+    stderrReadline?.removeAllListeners();
     stdoutReadline?.close();
     stderrReadline?.close();
     stdoutReadline = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.5-beta.16",
+  "version": "2.0.5-beta.18",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,10 +36,10 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.16",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.18",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
-    "@miwt/adb": "^0.9.0",
+    "@miwt/adb": "0.10.1",
     "adm-zip": "^0.5.16",
     "dayjs": "^1.11.12",
     "find-process": "^1.4.7",
@@ -53,5 +53,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "66255b9d69f9b15db10283d662f94f3d1f2486c3"
+  "gitHead": "cdcbff776773be9854039419016d04fa11bc7186"
 }