@aiot-toolkit/emulator 2.0.6-beta.3 → 2.0.6-beta.4

package/lib/emulatorutil/constants.d.ts

@@ -33,6 +33,7 @@ export declare const EmulatorEnvVersion: {
     skins: string;
     "system-images": string;
     modem_simulator: string;
+    tools: string;
 };
 /** 获取镜像下载地址 */
 export declare function getImageDownloadUrl(): Record<VelaImageType, string>;

package/lib/emulatorutil/constants.js

@@ -93,9 +93,10 @@ const EmulatorEnvVersion = exports.EmulatorEnvVersion = {
   name: '模拟器资源版本管理',
   [_Vvd.SDKParts.EMULATOR]: '0.1.0',
   [_Vvd.SDKParts.QA]: '0.0.1',
-  [_Vvd.SDKParts.SKINS]: '0.0.10',
+  [_Vvd.SDKParts.SKINS]: '0.0.12',
   [_Vvd.SDKParts.SYSTEM_IMAGES]: VelaImageVersionList[0].time,
-  [_Vvd.SDKParts.MODEM_SIMULATOR]: '0.0.3'
+  [_Vvd.SDKParts.MODEM_SIMULATOR]: '0.0.3',
+  [_Vvd.SDKParts.TOOLS]: '0.0.3'
 };
 
 /** 获取镜像下载地址 */
@@ -123,6 +124,7 @@ function getSDKPartDownloadUrl(type) {
     case _Vvd.SDKParts.QA:
     case _Vvd.SDKParts.MODEM_SIMULATOR:
     case _Vvd.SDKParts.SKINS:
+    case _Vvd.SDKParts.TOOLS:
       return `${baseUrl}/${type}/v${EmulatorEnvVersion[type]}/${type}.zip`;
   }
 }

package/lib/emulatorutil/running.js

@@ -54,7 +54,7 @@ function resolveLinuxPath() {
   for (const pattern of linuxPatterns) {
     if (!pattern) continue;
     const dir = resolvePath(pattern);
-    if (dir && _fs.default.existsSync(dir) && _fs.default.lstatSync(dir).isDirectory()) {
+    if (dir && _fs.default.existsSync(dir) && _fs.default.statSync(dir).isDirectory()) {
       return dir;
     }
   }

package/lib/instance/minisound.js

@@ -4,24 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MiniSound5 = void 0;
-var _adb = require("@miwt/adb");
+var _adb = _interopRequireWildcard(require("@miwt/adb"));
+var adbMiwt = _adb;
 var _Vvd = require("../typing/Vvd");
 var _miwear = require("./miwear5");
+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; }
 class MiniSound5 extends _miwear.VelaMiwear5 {
   imageType = (() => _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5)();
   appDir = '/data/app';
-  static emulatorStartedFlag = /\[launchQuickApp.*\] Start main loop/;
+  static emulatorStartedFlag = /Boot completed/;
   static appStartedFlag = /Start main loop/;
 
   /**
    * 使用 pm 安装快应用
    * @param targeRpk 快应用的rpk文件路径
    */
-  install(targeRpk) {
+  async 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}`);
+    const res = await adbMiwt.execAdbCmdAsync(installCmd);
+    await (0, _util.promisify)(process.nextTick)();
+    this.logger(`Install result: ${res}`);
+    // vela 5 安装成功的日志为:
+    // onInstallResult: com.application.watch.demo(success 0)
     if (res.includes('(success 0)')) {
       return Promise.resolve();
     } else {

package/lib/instance/miwear.js

@@ -64,7 +64,7 @@ class MiwearInstance extends _common.default {
       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;
+        return mu < 1 ? 20 * 1000 : mu < 4 ? 60 * 1000 : 2 * 60 * 1000;
       }
       const timeout = getTimeout(options?.size);
       let timer = setTimeout(() => {

package/lib/static/avdConfigIni.json

@@ -12,7 +12,7 @@
   "hw.camera.back": "None",
   "hw.camera.front": "None",
   "hw.cpu.arch": "arm",
-  "hw.cpu.ncore": 4,
+  "hw.cpu.ncore": 2,
   "hw.dPad": "no",
   "hw.gps": "yes",
   "hw.gpu.enabled": "no",

package/lib/typing/Vvd.d.ts

@@ -100,7 +100,8 @@ export declare enum SDKParts {
     QA = "qa",
     SKINS = "skins",
     SYSTEM_IMAGES = "system-images",
-    MODEM_SIMULATOR = "modem_simulator"
+    MODEM_SIMULATOR = "modem_simulator",
+    TOOLS = "tools"
 }
 export declare enum VELAHOME {
     SDK = ".vela/sdk",

package/lib/typing/Vvd.js

@@ -23,6 +23,7 @@ let SDKParts = exports.SDKParts = /*#__PURE__*/function (SDKParts) {
   SDKParts["SKINS"] = "skins";
   SDKParts["SYSTEM_IMAGES"] = "system-images";
   SDKParts["MODEM_SIMULATOR"] = "modem_simulator";
+  SDKParts["TOOLS"] = "tools";
   return SDKParts;
 }({});
 let VELAHOME = exports.VELAHOME = /*#__PURE__*/function (VELAHOME) {

package/lib/vvd/grpc/index.d.ts

@@ -14,7 +14,6 @@ export declare class GrpcEmulator {
     connected: boolean;
     token: string;
     authMate: Metadata;
-    deadline: Date;
     controller: any;
     screenshotStream?: Readable;
     logcatStream?: Readable;

package/lib/vvd/grpc/index.js

@@ -27,8 +27,6 @@ class GrpcEmulator {
       defaults: true,
       oneofs: true
     });
-    this.deadline = new Date();
-    this.deadline.setMinutes(this.deadline.getMinutes() + 2);
     this.controller = (0, _grpcJs.loadPackageDefinition)(packageDefinition).android.emulation.control;
     const mateInfo = new _grpcJs.Metadata();
     mateInfo.set(AuthorizationKey, `Bearer ${this.token}`);
@@ -53,8 +51,11 @@ class GrpcEmulator {
     if (this.connected) {
       return Promise.resolve(true);
     }
+    const deadline = new Date();
+    deadline.setMinutes(deadline.getMinutes() + 2); // 2 minutes timeout
+
     return new Promise((resolve, reject) => {
-      this.client.waitForReady(this.deadline, err => {
+      this.client.waitForReady(deadline, err => {
         if (err) {
           this.connected = false;
           console.error(err);

package/lib/vvd/index.js

@@ -368,13 +368,17 @@ class VvdManager {
     let needUpdate = false;
 
     // 检查 ramsize 调整为 1024
-    if (config['hw.ramSize'] < 1024) {
+    if (config['hw.ramSize'] && typeof config['hw.ramSize'] === 'number' && config['hw.ramSize'] < 1024) {
       needUpdate = true;
       config['hw.ramSize'] = 1024;
     }
+    // 统一路径分隔符为 /
+    const normalizePath = p => p.replace(/\\/g, '/');
+
     // 检查皮肤路径
-    if (config['skin.path']?.includes('.export_dev/skins')) {
-      if (config['skin.path'].includes('.export_dev/skins/user')) {
+    const skinPath = config['skin.path'];
+    if (skinPath && normalizePath(skinPath.toString())?.includes('.export_dev/skins')) {
+      if (normalizePath(skinPath.toString())?.includes('.export_dev/skins/user')) {
         // 自定义的皮肤，将自定义皮肤迁移到新的 sdk 目录中
         const oldUserSkinDir = _path.default.join(_os.default.homedir(), '.export_dev/skins/user');
         const newUserSkinDir = _path.default.join(this.sdkHome, 'skins', 'user');
@@ -394,13 +398,26 @@ class VvdManager {
         }
       }
       needUpdate = true;
-      config['skin.path'] = config['skin.path'].replace('.export_dev/skins', '.vela/sdk/skins');
+      config['skin.path'] = normalizePath(skinPath.toString()).replace('.export_dev/skins', '.vela/sdk/skins');
+    }
+
+    // 迁移 原来 user 目录中的 xiaomi_band_10
+    if (skinPath && normalizePath(skinPath.toString())?.endsWith('/user/xiaomi_band_10')) {
+      _ColorConsole.default.log('migrate user/xiaomi_band_10 to builtin/xiaomi_band_10');
+      config['skin.path'] = normalizePath(skinPath.toString()).replace('/user/xiaomi_band_10', '/builtin/xiaomi_band_10');
+      needUpdate = true;
+    }
+
+    // 检查 hw.cpu.ncore
+    if (config['hw.cpu.ncore'] && typeof config['hw.cpu.ncore'] === 'number' && config['hw.cpu.ncore'] > 2) {
+      needUpdate = true;
+      config['hw.cpu.ncore'] = 2;
     }
 
     // 检查镜像路径
-    if (config['image.sysdir.2']?.includes('.export_dev/system-images')) {
+    if (config['image.sysdir.2'] && normalizePath(config['image.sysdir.2'].toString())?.includes('.export_dev/system-images')) {
       needUpdate = true;
-      config['image.sysdir.2'] = config['image.sysdir.2'].replace('.export_dev/system-images', '.vela/sdk/system-images');
+      config['image.sysdir.2'] = normalizePath(config['image.sysdir.2'].toString()).replace('.export_dev/system-images', '.vela/sdk/system-images');
     }
     if (needUpdate) {
       await _promises.default.writeFile(configIni, (0, _ini.stringify)(config));
@@ -436,7 +453,7 @@ class VvdManager {
     // -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`;
+    const qemuOption = `-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting -smp 2`;
 
     // qt windows 配置
     // 在 docker，wls，等无界面平台上用 -no-window ,否则用 -qt-hide-window

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.6-beta.3",
+  "version": "2.0.6-beta.4",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -32,7 +32,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.3",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.4",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
     "@miwt/adb": "0.10.5",
@@ -49,5 +49,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "2e2ba4b1d293218736343237d963fe93c5fb27a8"
+  "gitHead": "1acc8279ba3c5995aebe3a97a6b33154086f09d6"
 }