@aiot-toolkit/emulator 2.0.5-beta.22 → 2.0.5-beta.23

package/lib/emulatorutil/constants.js

@@ -57,14 +57,14 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
   label: 'vela-miwear-watch-5.0',
   description: '适用于手表/手环的，带表盘的 vela 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5,
-  time: '20250619',
+  time: '20250626',
   hide: false,
   icon: ''
 }, {
   label: 'vela-watch-5.0',
   description: '适用于手表/手环的，不带表盘的 vela 5.0 镜像，可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_WATCH_5,
-  time: '20250619',
+  time: '20250626',
   hide: false,
   icon: ''
 }, {

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 export { VvdManager } from './vvd';
-import { getSystemArch, tryRun } from './utils';
+export { getSystemArch, tryRun } from './utils';
 export * from './instance';
 export * from './typing/Vvd';
 export * from './typing/Instance';
 export * from './emulatorutil';
-export { getSystemArch, tryRun };
+export * from './shared';

package/lib/index.js

@@ -75,4 +75,16 @@ Object.keys(_emulatorutil).forEach(function (key) {
       return _emulatorutil[key];
     }
   });
+});
+var _shared = require("./shared");
+Object.keys(_shared).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _shared[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _shared[key];
+    }
+  });
 });

package/lib/instance/common.d.ts

@@ -10,7 +10,7 @@ declare abstract class CommonEmulatorInstance {
     static appInstallFailedFlag: RegExp;
     static appUninstalledFlag: RegExp;
     static appStartedFlag: RegExp;
-    static isAppInstalled(log: string): boolean;
+    static isAppInstalled(...args: any[]): boolean;
     static isAppInstallFailed(log: string): boolean;
     static isAppUninstalled(log: string, packageName: string): boolean;
     static isEmulatorStarted(log: string): boolean;

package/lib/instance/common.js

@@ -11,6 +11,7 @@ var adbMiwt = _adb;
 var _utils = require("../utils");
 var _logcat = require("../vvd/logcat");
 var _emulatorutil = require("../emulatorutil");
+var _shared = require("../shared");
 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 }; }
@@ -21,14 +22,15 @@ class CommonEmulatorInstance {
   static appInstallFailedFlag = /uv_mq_read_cb: install prepare failed/;
   static appUninstalledFlag = /uninstalled app/;
   static appStartedFlag = /Start App loop/;
-  static isAppInstalled(log) {
+  static isAppInstalled() {
+    const log = arguments.length <= 0 ? undefined : arguments[0];
     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);
+    return new RegExp(this.appUninstalledFlag.source + ':\\s+' + packageName).test(log);
   }
   static isEmulatorStarted(log) {
     return this.emulatorStartedFlag.test(log);
@@ -117,7 +119,22 @@ class CommonEmulatorInstance {
   }
   async pushAndInstall(rpkPath, appName) {
     const targetPath = await this.pushRpk(rpkPath, appName);
-    await this.install(targetPath, appName);
+    try {
+      await this.install(targetPath, appName);
+    } catch (error) {
+      let timer;
+      if (error === _shared.RpkInstallFailedReason.Busy) {
+        this.logger('install process is busy, 3s later retry');
+        await new Promise((resolve, rejcet) => {
+          timer = setTimeout(() => {
+            this.pushAndInstall(rpkPath, appName).then(resolve).catch(rejcet);
+          }, 5000);
+        });
+      } else {
+        clearTimeout(timer);
+        throw error;
+      }
+    }
   }
 
   /** 关闭模拟器 */

package/lib/instance/miwear.d.ts

@@ -9,6 +9,7 @@ declare class MiwearInstance extends CommonEmulatorInstance {
     static appInstalledFlag: RegExp;
     imageType: VelaImageType;
     appDir: string;
+    static isAppInstalled(log: string, targetRpk: string): boolean;
     /**
      * 使用 pm 安装快应用
      * @param targeRpk 快应用的rpk文件路径

package/lib/instance/miwear.js

@@ -9,6 +9,7 @@ var _path = _interopRequireDefault(require("path"));
 var _utils = require("../utils");
 var _common = _interopRequireDefault(require("./common"));
 var _Vvd = require("../typing/Vvd");
+var _shared = require("../shared");
 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; }
@@ -21,7 +22,12 @@ class MiwearInstance extends _common.default {
   static appInstalledFlag = /InstallState_Finished|install finished/;
   imageType = (() => _Vvd.VelaImageType.REL)();
   appDir = '/data/quickapp/app';
-
+  static isAppInstalled(log, targetRpk) {
+    // 注意：targetRpk 可能包含特殊字符，需要转义
+    const escapedRpk = targetRpk.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const reg = new RegExp(`executeInstall: rpk install: ${escapedRpk} .* success`);
+    return reg.test(log);
+  }
   /**
    * 使用 pm 安装快应用
    * @param targeRpk 快应用的rpk文件路径
@@ -31,30 +37,40 @@ class MiwearInstance extends _common.default {
     this.logger(`Excuting: ${installCmd}`);
     adbMiwt.execAdbCmd(installCmd);
     return new Promise((resolve, reject) => {
+      const clearFn = () => {
+        clearTimeout(timer);
+        this.stdoutReadline.off('line', func);
+      };
       const func = msg => {
-        if (MiwearInstance.isAppInstalled(msg)) {
-          clearTimeout(timer);
+        if (MiwearInstance.isAppInstalled(msg, targeRpk)) {
           this.logger(`Install to ${this.vvdName} ${targeRpk} successfully`);
-          this.stdoutReadline.off('line', func);
+          clearFn();
           resolve();
         }
         if (MiwearInstance.isAppInstallFailed(msg)) {
-          clearTimeout(timer);
-          this.stdoutReadline.off('line', func);
           this.logger(`Failed Install to ${this.vvdName} ${targeRpk}`);
-          reject(msg);
+          this.logger(_shared.RpkInstallFailedReason.LowStorage);
+          clearFn();
+          reject(_shared.RpkInstallFailedReason.LowStorage);
+        }
+
+        // 当前安装进程被占用
+        if (msg.includes('installRpk: installation is running, please wait')) {
+          this.logger(_shared.RpkInstallFailedReason.Busy);
+          clearFn();
+          reject(_shared.RpkInstallFailedReason.Busy);
         }
       };
       let timer = setTimeout(() => {
         this.stdoutReadline.off('line', func);
         this.logger(`Install to ${this.vvdName} ${targeRpk} timeout`);
-        reject('Install timeout');
-      }, 2 * 60 * 1000);
+        reject(_shared.RpkInstallFailedReason.Timeout);
+      }, 1 * 60 * 1000);
       this.stdoutReadline.on('line', func);
       this.stdoutReadline.on('close', () => {
-        this.stdoutReadline.removeAllListeners();
+        this.stdoutReadline.off('line', func);
         clearTimeout(timer);
-        reject('Device poweroff');
+        reject(_shared.RpkInstallFailedReason.Poweroff);
       });
     });
   }
@@ -98,9 +114,9 @@ class MiwearInstance extends _common.default {
   }
   async closeApp(appName) {
     const stopCmd = `adb -s ${this.sn} shell am stop ${appName}`;
+    this.logger(`Excuting: ${stopCmd}`);
     await adbMiwt.execAdbCmdAsync(stopCmd);
     this.logger(`Stop ${this.vvdName} ${appName} successfully`);
-    // 这里是为了等am stop命令清除资源等
   }
   async reboot() {
     await super.reboot();

package/lib/instance/miwear5.d.ts

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

package/lib/instance/miwear5.js

@@ -10,6 +10,5 @@ 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/vela5.d.ts

@@ -10,4 +10,9 @@ export declare class Vela5Instance extends MiwearInstance {
      * @param targeRpk 快应用的rpk文件路径
      */
     install(targeRpk: string): Promise<void>;
+    /** 使用 am start 启动快应用 */
+    startApp(packageName: string): Promise<void>;
+    /** 重启模拟器 */
+    reboot(): Promise<void>;
+    closeApp(appName: string): Promise<void>;
 }

package/lib/instance/vela5.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Vela5Instance = void 0;
+var _shared = require("../shared");
 var _Vvd = require("../typing/Vvd");
+var _logcat = require("../vvd/logcat");
 var _miwear = _interopRequireDefault(require("./miwear"));
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
 var _util = require("util");
@@ -35,5 +37,62 @@ class Vela5Instance extends _miwear.default {
       return Promise.reject(res);
     }
   }
+
+  /** 使用 am start 启动快应用 */
+  async startApp(packageName) {
+    const startCmd = `adb -s ${this.sn} shell am start ${packageName}`;
+    this.logger(`Excuting: ${startCmd}`);
+    adbMiwt.execAdbCmdAsync(startCmd);
+    return new Promise((resolve, reject) => {
+      const clearFn = () => {
+        clearTimeout(timer);
+        this.stdoutReadline.off('line', func);
+      };
+      const func = msg => {
+        if (Vela5Instance.appStartedFlag.test(msg)) {
+          this.logger(`Start ${packageName} for ${this.vvdName} successfully`);
+          clearFn();
+          resolve();
+        }
+        const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const reg = new RegExp(`Failed to open: .+?/${escapedPackageName}/manifest\.json`);
+        if (reg.test(msg)) {
+          this.logger(`Failed Start ${packageName} for ${this.vvdName}`);
+          clearFn();
+          reject(_shared.RpkStartFailedReason.getManifestFailed);
+        }
+      };
+      let timer = setTimeout(() => {
+        this.stdoutReadline.off('line', func);
+        this.logger(`Start ${packageName} for ${this.vvdName} timeout`);
+        reject('Timeout');
+      }, 8 * 1000);
+      this.stdoutReadline.on('line', func);
+    });
+  }
+
+  /** 重启模拟器 */
+  async reboot() {
+    const rebootCmd = `adb -s ${this.sn} shell reboot`;
+    this.logger(`Excuting: ${rebootCmd}`);
+    await adbMiwt.execAdbCmdAsync(rebootCmd);
+    await this.isConnected();
+    if (this.logcatProcess.exitCode !== null) {
+      // 如果 logcat 进程被杀死，则重新创建
+      const r = (0, _logcat.creatLogcat)(this.sn, this.onStdout, this.onErrout);
+      this.logcatProcess = r.logcatProcess;
+      this.stdoutReadline = r.stdoutReadline;
+      this.stderrReadline = r.stderrReadline;
+      this.disposeReadlines = r.dispose;
+    }
+  }
+  async closeApp(appName) {
+    await super.closeApp(appName);
+    await new Promise(resolve => {
+      setTimeout(() => {
+        resolve();
+      }, 2000);
+    });
+  }
 }
 exports.Vela5Instance = Vela5Instance;

package/lib/shared/index.d.ts

@@ -6,3 +6,12 @@ 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;
+export declare enum RpkStartFailedReason {
+    getManifestFailed = "Get app manifest.json failed"
+}
+export declare enum RpkInstallFailedReason {
+    Busy = "Installation process is busy",
+    Timeout = "Install timeout",
+    Poweroff = "Device poweroff",
+    LowStorage = "Application exceeds maximum quantity or remaining space is low"
+}

package/lib/shared/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.RpkStartFailedReason = exports.RpkInstallFailedReason = void 0;
 exports.getDefaultImage = getDefaultImage;
 exports.isMiwearImageType = isMiwearImageType;
 exports.isVelaImageType = isVelaImageType;
@@ -20,4 +21,15 @@ function isMiwearImageType(val) {
 }
 function getDefaultImage() {
   return _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5;
-}
+}
+let RpkStartFailedReason = exports.RpkStartFailedReason = /*#__PURE__*/function (RpkStartFailedReason) {
+  RpkStartFailedReason["getManifestFailed"] = "Get app manifest.json failed";
+  return RpkStartFailedReason;
+}({});
+let RpkInstallFailedReason = exports.RpkInstallFailedReason = /*#__PURE__*/function (RpkInstallFailedReason) {
+  RpkInstallFailedReason["Busy"] = "Installation process is busy";
+  RpkInstallFailedReason["Timeout"] = "Install timeout";
+  RpkInstallFailedReason["Poweroff"] = "Device poweroff";
+  RpkInstallFailedReason["LowStorage"] = "Application exceeds maximum quantity or remaining space is low";
+  return RpkInstallFailedReason;
+}({});

package/lib/vvd/index.js

@@ -394,12 +394,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);
         }
       }
@@ -745,6 +747,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();
@@ -774,6 +780,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-beta.22",
+  "version": "2.0.5-beta.23",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,7 +36,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.22",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.23",
     "@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": "cb8b82107dd1d8e977a529fcd334095627bd5d7c"
+  "gitHead": "f4991bcb0dcaab6853597ca07d21a7999649a1cc"
 }