@aiot-toolkit/emulator 2.0.5-widget-provider-beta.2 → 2.0.5

package/lib/instance/miwear.js

@@ -9,59 +9,81 @@ 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; }
-/**
- * MiwearInstance
- * 针对 Vela正式版（4.0）的镜像
+/**
+ * MiwearInstance
+ * 针对 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';
-
-  /**
-   * 使用 pm 安装快应用
-   * @param targeRpk 快应用的rpk文件路径
+  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文件路径
    */
-  async install(targeRpk) {
+  async install(targeRpk, options) {
     const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
     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);
         }
       };
+      function getTimeout(size) {
+        if (!size) return 10 * 1000;
+        const mu = size / 1024 / 1024;
+        return mu < 1 ? 10 * 1000 : mu < 4 ? 60 * 1000 : 2 * 60 * 1000;
+      }
+      const timeout = getTimeout(options?.size);
       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);
+      }, timeout);
       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);
       });
     });
   }
 
-  /**
-   * 使用 pm 卸载快应用
-   * @param packageName 快应用的包名
+  /**
+   * 使用 pm 卸载快应用
+   * @param packageName 快应用的包名
    */
   uninstall(packageName) {
     adbMiwt.execAdbCmd(`adb -s ${this.sn} shell pm uninstall ${packageName}`);
@@ -98,9 +120,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/pre.d.ts

@@ -7,7 +7,10 @@ declare class PreInstance extends CommonEmulatorInstance {
     imageType: VelaImageType;
     appDir: string;
     static emulatorStartedFlag: RegExp;
-    install(rpkPath: string, appPackageName?: string): Promise<void>;
+    install(rpkPath: string, opt: {
+        packageName: string;
+        size?: number;
+    }): Promise<void>;
     uninstall(packageName: string): Promise<void>;
     /**
      * 在模拟器中启动快应用

package/lib/instance/pre.js

@@ -10,17 +10,17 @@ 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; }
-/**
- * 不带 miwear 的 4.0 镜像
+/**
+ * 不带 miwear 的 4.0 镜像
  */
 class PreInstance extends _common.default {
   imageType = (() => _Vvd.VelaImageType.PRE)();
   appDir = '/data/quickapp/app';
   static emulatorStartedFlag = /(NSH)/;
-  async install(rpkPath, appPackageName) {
+  async install(rpkPath, opt) {
     // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
-    rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;
-    const targetPath = `${this.appDir}/${appPackageName}`;
+    rpkPath = rpkPath || `${this.appDir}/${opt.packageName}.rpk`;
+    const targetPath = `${this.appDir}/${opt.packageName}`;
     const mkdirCmd = `adb -s ${this.sn} shell mkdir ${targetPath}`;
     this.logger(`Excuting: ${mkdirCmd}`);
     await adbMiwt.execAdbCmdAsync(mkdirCmd);
@@ -36,10 +36,10 @@ class PreInstance extends _common.default {
     await adbMiwt.execAdbCmdAsync(mkdirCmd);
   }
 
-  /**
-   * 在模拟器中启动快应用
-   * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
-   * @param options
+  /**
+   * 在模拟器中启动快应用
+   * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
+   * @param options
    */
   async startApp(packageName) {
     let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;

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");
@@ -12,14 +14,14 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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 Vela5Instance extends _miwear.default {
-  static emulatorStartedFlag = /Boot completed/;
+  static emulatorStartedFlag = /booting completed|Boot completed/;
   static appStartedFlag = /Start main loop/;
   imageType = (() => _Vvd.VelaImageType.VELA_WATCH_5)();
   appDir = '/data/app';
 
-  /**
-   * 使用 pm 安装快应用
-   * @param targeRpk 快应用的rpk文件路径
+  /**
+   * 使用 pm 安装快应用
+   * @param targeRpk 快应用的rpk文件路径
    */
   async install(targeRpk) {
     const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
@@ -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,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.RpkStartFailedReason = exports.RpkInstallFailedReason = void 0;
 exports.getDefaultImage = getDefaultImage;
 exports.isMiwearImageType = isMiwearImageType;
 exports.isVelaImageType = isVelaImageType;
 var _Vvd = require("../typing/Vvd");
-/**
- * 本文件用于导出一些同构内容，请勿引用非同构内容，例如 nodejs 特性内容，或者 browser 特性内容
- * @TODO 项目转为 ESM 模块后，可以删除
+/**
+ * 本文件用于导出一些同构内容，请勿引用非同构内容，例如 nodejs 特性内容，或者 browser 特性内容
+ * @TODO 项目转为 ESM 模块后，可以删除
  * */
 
 function isVelaImageType(value) {
@@ -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/static/advancedFeatures.ini

@@ -1 +1 @@
-ModemSimulator = on
+ModemSimulator = on

package/lib/static/avdConfigIni.json

@@ -1,39 +1,45 @@
-{
-  "AvdId": "Vela_Virtual_Device",
-  "abi.type": "armeabi-v7a",
-  "avd.ini.displayname": "Vela_Virtual_Device",
-  "avd.ini.encoding": "UTF-8",
-  "fastboot.forceChosenSnapshotBoot": "no",
-  "fastboot.forceColdBoot": "yes",
-  "fastboot.forceFastBoot": "no",
-  "hw.accelerometer": "yes",
-  "hw.arc": false,
-  "hw.audioInput": "yes",
-  "hw.battery": "yes",
-  "hw.camera.back": "None",
-  "hw.camera.front": "None",
-  "hw.cpu.arch": "arm",
-  "hw.cpu.ncore": 4,
-  "hw.dPad": "no",
-  "hw.gps": "yes",
-  "hw.gpu.enabled": "no",
-  "hw.gpu.mode": "host",
-  "hw.initialOrientation": "Portrait",
-  "hw.keyboard": "yes",
-  "hw.lcd.density": 420,
-  "hw.lcd.height": 466,
-  "hw.lcd.width": 466,
-  "hw.mainKeys": "no",
-  "hw.ramSize": 512,
-  "hw.sdCard": "no",
-  "hw.sensors.orientation": "yes",
-  "hw.sensors.proximity": "yes",
-  "hw.trackBall": "no",
-  "image.sysdir.2": "",
-  "runtime.network.latency": "none",
-  "runtime.network.speed": "full",
-  "showDeviceFrame": "yes",
-  "skin.dynamic": "no",
-  "skin.name": "",
-  "skin.path": ""
-}
+{
+  "AvdId": "Vela_Virtual_Device",
+  "abi.type": "armeabi-v7a",
+  "avd.ini.displayname": "Vela_Virtual_Device",
+  "avd.ini.encoding": "UTF-8",
+  "fastboot.forceChosenSnapshotBoot": "no",
+  "fastboot.forceColdBoot": "yes",
+  "fastboot.forceFastBoot": "no",
+  "hw.arc": false,
+  "hw.audioInput": "yes",
+  "hw.battery": "yes",
+  "hw.camera.back": "None",
+  "hw.camera.front": "None",
+  "hw.cpu.arch": "arm",
+  "hw.cpu.ncore": 4,
+  "hw.dPad": "no",
+  "hw.gps": "yes",
+  "hw.gpu.enabled": "no",
+  "hw.gpu.mode": "host",
+  "hw.initialOrientation": "Portrait",
+  "hw.keyboard": "yes",
+  "hw.lcd.density": 420,
+  "hw.lcd.height": 466,
+  "hw.lcd.width": 466,
+  "hw.mainKeys": "no",
+  "hw.ramSize": 1024,
+  "hw.sdCard": "no",
+  "hw.sensors.orientation": "yes",
+  "hw.trackBall": "no",
+  "image.sysdir.2": "",
+  "runtime.network.latency": "none",
+  "runtime.network.speed": "full",
+  "showDeviceFrame": "yes",
+  "skin.dynamic": "no",
+  "skin.name": "",
+  "skin.path": "",
+  "hw.accelerometer": "yes",
+  "hw.gyroscope": "yes",
+  "hw.sensors.proximity": "yes",
+  "hw.sensors.magnetic_field": "yes",
+  "hw.sensors.temperature": "yes",
+  "hw.sensors.light": "yes",
+  "hw.sensors.humidity": "yes",
+  "hw.sensors.heart_rate": "yes"
+}

package/lib/static/debugger_ip.cfg

@@ -1 +1 @@
-10.0.2.15:101
+10.0.2.15:101

package/lib/static/proto/README.MD

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