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

package/lib/emulatorutil/constants.d.ts

@@ -9,10 +9,15 @@ export declare const defaultToolsHome: string;
 export declare const defaultVncPort = 5900;
 export declare const defaultAdbPort = 5555;
 export declare const defaultDebugPort = 10055;
-export declare const baseUrl = "https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide";
-export declare const versionUrl = "https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/versions.json";
-export declare const emulatorBaseUrl = "https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/emulator";
-export declare const systemImageBaseUrl = "https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/system-images";
+/**
+ * 获取 Vela Emulator SDK 相关下载地址
+ */
+export declare function getSdkUrl(): Promise<{
+    baseUrl: string;
+    versionUrl: string;
+    emulatorBaseUrl: string;
+    systemImageBaseUrl: string;
+}>;
 /**
  * vela-release-4.0 ： vela 4.0 带 miwear
  * vela-pre-4.0     ： vela 4.0 不带 miwear
@@ -33,13 +38,14 @@ export declare const EmulatorEnvVersion: {
     skins: string;
     "system-images": string;
     modem_simulator: string;
+    tools: string;
 };
 /** 获取镜像下载地址 */
-export declare function getImageDownloadUrl(): Record<VelaImageType, string>;
+export declare function getImageDownloadUrl(): Promise<Record<VelaImageType, string>>;
 /**
  * 获取各种 SKD 最新版本的下载地址;
  * 镜像地址默认返回 REL 版本的地址，如果需要获取其他版本，请使用
  * {@link getImageDownloadUrl}
  */
-export declare function getSDKPartDownloadUrl(type: SDKParts): string;
+export declare function getSDKPartDownloadUrl(type: SDKParts): Promise<string>;
 export { isVelaImageType, isMiwearImageType, getDefaultImage } from '../shared';

package/lib/emulatorutil/constants.js

@@ -3,7 +3,7 @@
 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.defaultVvdHome = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultSkinHome = exports.defaultSDKHome = exports.defaultQuickappHome = exports.defaultImageHome = exports.defaultEmulatorHome = exports.defaultDebugPort = exports.defaultAdbPort = exports.VelaImageVersionList = exports.EmulatorEnvVersion = void 0;
 Object.defineProperty(exports, "getDefaultImage", {
   enumerable: true,
   get: function () {
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "getDefaultImage", {
 });
 exports.getImageDownloadUrl = getImageDownloadUrl;
 exports.getSDKPartDownloadUrl = getSDKPartDownloadUrl;
+exports.getSdkUrl = getSdkUrl;
 Object.defineProperty(exports, "isMiwearImageType", {
   enumerable: true,
   get: function () {
@@ -24,9 +25,9 @@ Object.defineProperty(exports, "isVelaImageType", {
     return _shared.isVelaImageType;
   }
 });
-exports.versionUrl = exports.systemImageBaseUrl = void 0;
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
+var _https = _interopRequireDefault(require("https"));
 var _Vvd = require("../typing/Vvd");
 var _utils = require("../utils");
 var _shared = require("../shared");
@@ -41,10 +42,32 @@ const defaultToolsHome = exports.defaultToolsHome = _path.default.resolve(defaul
 const defaultVncPort = exports.defaultVncPort = 5900;
 const defaultAdbPort = exports.defaultAdbPort = 5555;
 const defaultDebugPort = exports.defaultDebugPort = 10055;
-const baseUrl = exports.baseUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide';
-const versionUrl = exports.versionUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/versions.json';
-const emulatorBaseUrl = exports.emulatorBaseUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/emulator';
-const systemImageBaseUrl = exports.systemImageBaseUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide/system-images';
+
+/**
+ * 获取 Vela Emulator SDK 相关下载地址
+ */
+async function getSdkUrl() {
+  const externalBaseUrl = 'https://vela-ide.cnbj3-fusion.mi-fds.com/vela-ide';
+  const internalBaseUrl = 'https://cnbj3-fusion-fds.api.xiaomi.net/vela-ide';
+  // 优先使用内网域名，因为云上工程没有外网环境
+  let base = internalBaseUrl;
+  await new Promise(resolve => {
+    _https.default.get(`${base}/versions.json`, {
+      timeout: 2000
+    }, res => {
+      if (res.statusCode !== 200) {
+        base = externalBaseUrl;
+      }
+      resolve();
+    });
+  });
+  return {
+    baseUrl: base,
+    versionUrl: `${base}/versions.json`,
+    emulatorBaseUrl: `${base}/emulator`,
+    systemImageBaseUrl: `${base}/system-images`
+  };
+}
 
 // 不确定vela镜像的发布策略，暂时需要手动更新此列表
 // 0.0.2和0.0.3版本比较特殊，线上是一个nuttx文件。其他版本都是一个zip包，包含nuttx data.img和vela_source.img
@@ -91,15 +114,19 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
 }];
 const EmulatorEnvVersion = exports.EmulatorEnvVersion = {
   name: '模拟器资源版本管理',
-  [_Vvd.SDKParts.EMULATOR]: '0.1.0',
+  [_Vvd.SDKParts.EMULATOR]: '0.2.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'
 };
 
 /** 获取镜像下载地址 */
-function getImageDownloadUrl() {
+async function getImageDownloadUrl() {
+  const {
+    systemImageBaseUrl
+  } = await getSdkUrl();
   return VelaImageVersionList.reduce((res, t) => {
     res[t.value] = `${systemImageBaseUrl}/${t.value}/${t.time}/${t.value}.zip`;
     return res;
@@ -111,7 +138,11 @@ function getImageDownloadUrl() {
  * 镜像地址默认返回 REL 版本的地址，如果需要获取其他版本，请使用
  * {@link getImageDownloadUrl}
  */
-function getSDKPartDownloadUrl(type) {
+async function getSDKPartDownloadUrl(type) {
+  const {
+    emulatorBaseUrl,
+    baseUrl
+  } = await getSdkUrl();
   switch (type) {
     case _Vvd.SDKParts.EMULATOR:
       const systemOs = _os.default.platform();
@@ -119,10 +150,11 @@ function getSDKPartDownloadUrl(type) {
       let hostOs = systemOs === 'win32' ? 'windows' : systemOs;
       return `${emulatorBaseUrl}/v${EmulatorEnvVersion.emulator}/${hostOs}-${hostArch}.zip`;
     case _Vvd.SDKParts.SYSTEM_IMAGES:
-      return getImageDownloadUrl()[(0, _shared.getDefaultImage)()];
+      return (await getImageDownloadUrl())[(0, _shared.getDefaultImage)()];
     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/index.d.ts

@@ -1,4 +1,4 @@
-export { VvdManager } from './vvd';
+export * from './vvd';
 export { getSystemArch, tryRun } from './utils';
 export * from './instance';
 export * from './typing/Vvd';

package/lib/index.js

@@ -4,16 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  VvdManager: true,
   getSystemArch: true,
   tryRun: true
 };
-Object.defineProperty(exports, "VvdManager", {
-  enumerable: true,
-  get: function () {
-    return _vvd.VvdManager;
-  }
-});
 Object.defineProperty(exports, "getSystemArch", {
   enumerable: true,
   get: function () {
@@ -27,6 +20,17 @@ Object.defineProperty(exports, "tryRun", {
   }
 });
 var _vvd = require("./vvd");
+Object.keys(_vvd).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _vvd[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _vvd[key];
+    }
+  });
+});
 var _utils = require("./utils");
 var _instance = require("./instance");
 Object.keys(_instance).forEach(function (key) {

package/lib/instance/common.d.ts

@@ -5,7 +5,8 @@ import { ChildProcessWithoutNullStreams } from 'child_process';
 declare abstract class CommonEmulatorInstance {
     imageType: VelaImageType;
     appDir: string;
-    static emulatorStartedFlag: RegExp;
+    xmsInitedFlag: RegExp;
+    xmsStatus: PromiseWithResolvers<void>;
     static appInstalledFlag: RegExp;
     static appInstallFailedFlag: RegExp;
     static appUninstalledFlag: RegExp;
@@ -13,7 +14,7 @@ declare abstract class CommonEmulatorInstance {
     static isAppInstalled(...args: any[]): boolean;
     static isAppInstallFailed(log: string): boolean;
     static isAppUninstalled(log: string, packageName: string): boolean;
-    static isEmulatorStarted(log: string): boolean;
+    isXmsInited(log: string): boolean;
     sn: string;
     vvdName: string;
     debugPort?: number | string;

package/lib/instance/common.js

@@ -18,7 +18,9 @@ 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|Boot completed/;
+
+  // 判断 xms 服务是否初始化完成的标志
+  xmsInitedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
   static appInstalledFlag = /InstallState_Finished|install finished/;
   static appInstallFailedFlag = /uv_mq_read_cb: install prepare failed/;
   static appUninstalledFlag = /uninstalled app/;
@@ -33,8 +35,8 @@ class CommonEmulatorInstance {
   static isAppUninstalled(log, packageName) {
     return new RegExp(this.appUninstalledFlag.source + ':\\s+' + packageName).test(log);
   }
-  static isEmulatorStarted(log) {
-    return this.emulatorStartedFlag.test(log);
+  isXmsInited(log) {
+    return this.xmsInitedFlag.test(log);
   }
   constructor(params) {
     this.sn = `emulator-${params.serialPort}`;
@@ -71,6 +73,16 @@ class CommonEmulatorInstance {
       this.stderrReadline = r.stderrReadline;
       this.disposeReadlines = r.dispose;
     }
+    const {
+      resolve,
+      reject,
+      promise
+    } = Promise.withResolvers();
+    this.xmsStatus = {
+      promise,
+      resolve,
+      reject
+    };
   }
 
   /** 安装应用，留给子类实现 */
@@ -85,6 +97,7 @@ class CommonEmulatorInstance {
 
   /** 推送指定文件,返回推送结果 */
   async push(sourcePath, targetPath) {
+    await this.xmsStatus.promise;
     // 1. adb push应用的rpk
     const pushCmd = `adb -s ${this.sn} push "${sourcePath}" ${targetPath}`;
     this.logger(`Excuting: ${pushCmd}`);

package/lib/instance/minisound.d.ts

@@ -3,7 +3,7 @@ import { VelaMiwear5 } from './miwear5';
 export declare class MiniSound5 extends VelaMiwear5 {
     imageType: VelaImageType;
     appDir: string;
-    static emulatorStartedFlag: RegExp;
+    xmsInitedFlag: RegExp;
     static appStartedFlag: RegExp;
     /**
      * 使用 pm 安装快应用

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 _Vvd = require("../typing/Vvd");
 var _miwear = require("./miwear5");
+var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
+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/;
+  xmsInitedFlag = /Boot completed/;
   static appStartedFlag = /Start main loop/;
 
   /**
    * 使用 pm 安装快应用
    * @param targeRpk 快应用的rpk文件路径
    */
-  install(targeRpk) {
+  async install(targeRpk) {
+    await this.xmsStatus.promise;
     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 {
@@ -33,8 +40,9 @@ class MiniSound5 extends _miwear.VelaMiwear5 {
    * 使用 pm 卸载快应用
    * @param packageName 快应用的包名
    */
-  uninstall(packageName) {
-    const res = (0, _adb.execAdbCmdSync)(`adb -s ${this.sn} shell pm uninstall ${packageName}`);
+  async uninstall(packageName) {
+    await this.xmsStatus.promise;
+    const res = await adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell pm uninstall ${packageName}`);
     if (res.includes('(success 0)')) {
       return Promise.resolve();
     } else {

package/lib/instance/miwear.d.ts

@@ -5,7 +5,7 @@ import { VelaImageType } from '../typing/Vvd';
  * 针对 Vela正式版（4.0）的镜像
  */
 declare class MiwearInstance extends CommonEmulatorInstance {
-    static emulatorStartedFlag: RegExp;
+    xmsInitedFlag: RegExp;
     static appInstalledFlag: RegExp;
     imageType: VelaImageType;
     appDir: string;

package/lib/instance/miwear.js

@@ -18,7 +18,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/;
+  xmsInitedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
   static appInstalledFlag = /InstallState_Finished|install finished/;
   imageType = (() => _Vvd.VelaImageType.REL)();
   appDir = '/data/quickapp/app';
@@ -33,6 +33,8 @@ class MiwearInstance extends _common.default {
    * @param targeRpk 快应用的rpk文件路径
    */
   async install(targeRpk, options) {
+    //  等待 xms 服务初始化完成之后才能进行安装
+    await this.xmsStatus.promise;
     const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
     this.logger(`Excuting: ${installCmd}`);
     adbMiwt.execAdbCmd(installCmd);
@@ -64,7 +66,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(() => {
@@ -85,7 +87,9 @@ class MiwearInstance extends _common.default {
    * 使用 pm 卸载快应用
    * @param packageName 快应用的包名
    */
-  uninstall(packageName) {
+  async uninstall(packageName) {
+    //  等待 xms 服务初始化完成之后才能进行安装
+    await this.xmsStatus.promise;
     adbMiwt.execAdbCmd(`adb -s ${this.sn} shell pm uninstall ${packageName}`);
     return new Promise((resolve, reject) => {
       const func = msg => {
@@ -107,6 +111,8 @@ class MiwearInstance extends _common.default {
   /** 使用 am start 启动快应用 */
   async startApp(packageName) {
     let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    //  等待 xms 服务初始化完成之后才能进行安装
+    await this.xmsStatus.promise;
     // 调试模式需要push一个文件至miwear中
     if (debug) {
       const debuggerCfgFile = _path.default.join(__dirname, '../static/debugger_ip.cfg');
@@ -119,6 +125,7 @@ class MiwearInstance extends _common.default {
     await adbMiwt.execAdbCmdAsync(startCmd);
   }
   async closeApp(appName) {
+    await this.xmsStatus.promise;
     const stopCmd = `adb -s ${this.sn} shell am stop ${appName}`;
     this.logger(`Excuting: ${stopCmd}`);
     await adbMiwt.execAdbCmdAsync(stopCmd);
@@ -128,7 +135,7 @@ class MiwearInstance extends _common.default {
     await super.reboot();
     return new Promise((resolve, reject) => {
       const func = msg => {
-        if (MiwearInstance.isEmulatorStarted(msg)) {
+        if (this.isXmsInited(msg)) {
           clearTimeout(timer);
           resolve();
         }
@@ -142,6 +149,7 @@ class MiwearInstance extends _common.default {
     });
   }
   async reloadApp(appPackageName) {
+    await this.xmsStatus.promise;
     try {
       // 2. 执行am stop和am start命令
       const stopCmd = `adb -s ${this.sn} shell am stop ${appPackageName}`;

package/lib/instance/pre.d.ts

@@ -6,7 +6,7 @@ import CommonEmulatorInstance from './common';
 declare class PreInstance extends CommonEmulatorInstance {
     imageType: VelaImageType;
     appDir: string;
-    static emulatorStartedFlag: RegExp;
+    xmsInitedFlag: RegExp;
     install(rpkPath: string, opt: {
         packageName: string;
         size?: number;

package/lib/instance/pre.js

@@ -16,8 +16,10 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 class PreInstance extends _common.default {
   imageType = (() => _Vvd.VelaImageType.PRE)();
   appDir = '/data/quickapp/app';
-  static emulatorStartedFlag = /(NSH)/;
+  xmsInitedFlag = /(NSH)/;
   async install(rpkPath, opt) {
+    await this.xmsStatus.promise;
+
     // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
     rpkPath = rpkPath || `${this.appDir}/${opt.packageName}.rpk`;
     const targetPath = `${this.appDir}/${opt.packageName}`;

package/lib/instance/vela5.d.ts

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

package/lib/instance/vela5.js

@@ -14,7 +14,7 @@ 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 = /booting completed|Boot completed/;
+  xmsInitedFlag = /booting completed|Boot completed/;
   static appStartedFlag = /Start main loop/;
   imageType = (() => _Vvd.VelaImageType.VELA_WATCH_5)();
   appDir = '/data/app';
@@ -24,6 +24,7 @@ class Vela5Instance extends _miwear.default {
    * @param targeRpk 快应用的rpk文件路径
    */
   async install(targeRpk) {
+    await this.xmsStatus.promise;
     const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
     this.logger(`Excuting: ${installCmd}`);
     const res = await adbMiwt.execAdbCmdAsync(installCmd);
@@ -40,10 +41,16 @@ class Vela5Instance extends _miwear.default {
 
   /** 使用 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) => {
+    return new Promise(async (resolve, reject) => {
+      let timer = setTimeout(() => {
+        this.stdoutReadline.off('line', func);
+        this.logger(`Start ${packageName} for ${this.vvdName} timeout`);
+        reject('Timeout');
+      }, 15 * 1000);
+      await this.xmsStatus.promise;
+      const startCmd = `adb -s ${this.sn} shell am start ${packageName}`;
+      this.logger(`Excuting: ${startCmd}`);
+      await adbMiwt.execAdbCmdAsync(startCmd);
       const clearFn = () => {
         clearTimeout(timer);
         this.stdoutReadline.off('line', func);
@@ -62,11 +69,6 @@ class Vela5Instance extends _miwear.default {
           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);
     });
   }

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

@@ -27,8 +27,9 @@ export interface IVvdParams {
     flavor?: string;
     density?: string;
     customLcdRadius?: string;
-    imageType: VelaImageType;
+    imageType?: VelaImageType;
     skinInfo?: EmulatorSkin;
+    marketName?: string;
 }
 export interface EmulatorPart {
     display: {
@@ -100,7 +101,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

@@ -10,7 +10,10 @@ var _protoLoader = require("@grpc/proto-loader");
 var _grpcError = require("./grpcError");
 var _grpcJs = require("@grpc/grpc-js");
 var _protoTypes = require("./types/proto-types");
+var _connectivityState = require("@grpc/grpc-js/build/src/connectivity-state");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// eslint-disable-next-line no-restricted-imports
+
 const AuthorizationKey = exports.AuthorizationKey = 'Authorization';
 class GrpcEmulator {
   connected = false;
@@ -27,8 +30,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}`);
@@ -49,21 +50,53 @@ class GrpcEmulator {
   getAuthMeta() {
     return this.authMate;
   }
-  waitForReady() {
+  async waitForReady() {
     if (this.connected) {
-      return Promise.resolve(true);
+      return true;
     }
-    return new Promise((resolve, reject) => {
-      this.client.waitForReady(this.deadline, err => {
-        if (err) {
-          this.connected = false;
-          console.error(err);
-          return reject(err);
+    const channel = this.client.getChannel();
+    const curState = channel.getConnectivityState(true);
+    if (curState === _connectivityState.ConnectivityState.READY) {
+      return true;
+    }
+    const {
+      resolve,
+      reject,
+      promise
+    } = Promise.withResolvers();
+    let count = 0;
+    const watcher = () => {
+      if (++count >= 5) {
+        return reject(new Error('gRPC connection failed'));
+      }
+      const deadline = new Date();
+      deadline.setMinutes(deadline.getMinutes() + 2); // 2 minutes timeout
+
+      channel.watchConnectivityState(curState, deadline, e => {
+        if (e) {
+          reject(e);
+        }
+        const newState = channel.getConnectivityState(true);
+        switch (newState) {
+          case _connectivityState.ConnectivityState.TRANSIENT_FAILURE:
+            reject(new Error('gRPC connection failed'));
+            break;
+          case _connectivityState.ConnectivityState.READY:
+            this.connected = true;
+            resolve(true);
+            break;
+          case _connectivityState.ConnectivityState.SHUTDOWN:
+            reject(new Error('gRPC connection shutdown'));
+            break;
+          case _connectivityState.ConnectivityState.CONNECTING:
+            watcher();
+          default:
+            break;
         }
-        this.connected = true;
-        resolve(true);
       });
-    });
+    };
+    watcher();
+    return promise;
   }
   async streamScreenshot(imageFormat) {
     await this.waitForReady();

package/lib/vvd/index.d.ts

@@ -5,6 +5,17 @@ import { findInstance } from '../instance';
 import type { DownloadFileOptions } from 'ipull';
 import { GrpcEmulator } from './grpc';
 export declare const isHeadlessEnvironment: () => boolean;
+export interface StartVvdRes {
+    coldBoot: boolean;
+    emulatorInstance: ReturnType<typeof findInstance>;
+    /**
+     * @deprecated use velaAgent instead
+     */
+    getAgent: () => GrpcEmulator;
+    grpcConfig: EmulatorConfig;
+    velaAgent: GrpcEmulator;
+    imageType: VelaImageType;
+}
 export declare class VvdManager {
     private vvdHome;
     private sdkHome;
@@ -53,12 +64,7 @@ export declare class VvdManager {
     getEmulatorBinPath(sdkHome: string): string;
     oldEmulatorMigrate(vvdName: string): Promise<void>;
     getVvdStartCmd(options: IStartOptions | IStartWithSerialPort): Promise<string>;
-    startVvd(options: IStartOptions | IStartWithSerialPort): Promise<{
-        coldBoot: boolean;
-        emulatorInstance: ReturnType<typeof findInstance>;
-        getAgent: () => GrpcEmulator;
-        grpcConfig: EmulatorConfig;
-    }>;
+    startVvd(options: IStartOptions | IStartWithSerialPort): Promise<StartVvdRes>;
     stopVvd(name: string, timeout?: number): Promise<void>;
     /** 获取模拟器平台的名称，darwin-aarch64 linux-aarch64 windows-x86_64等 */
     getEmulatorPlatform(): string;

package/lib/vvd/index.js

@@ -100,7 +100,8 @@ class VvdManager {
       density,
       imageDir: imagePath = _constants.defaultImageHome,
       customLcdRadius,
-      imageType
+      imageType,
+      marketName
     } = vvdParams;
     const vvdDir = _path.default.resolve(this.vvdHome, `${vvdName}.vvd`);
     const vvdIni = _path.default.resolve(this.vvdHome, `${vvdName}.ini`);
@@ -112,11 +113,11 @@ class VvdManager {
     configIniJson['abi.type'] = abiType;
     configIniJson['avd.ini.displayname'] = vvdName;
     configIniJson['hw.cpu.arch'] = arch;
-    configIniJson['hw.lcd.shape'] = shape;
-    configIniJson['hw.device.flavor'] = flavor;
-    configIniJson['hw.lcd.density'] = density;
-    configIniJson['ide.lcd.radius'] = customLcdRadius;
-    configIniJson['ide.image.type'] = imageType;
+    if (shape) configIniJson['hw.lcd.shape'] = shape;
+    if (flavor) configIniJson['hw.device.flavor'] = flavor;
+    if (density) configIniJson['hw.lcd.density'] = density;
+    if (customLcdRadius) configIniJson['ide.lcd.radius'] = customLcdRadius;
+    if (imageType) configIniJson['ide.image.type'] = imageType;
     if (skin) {
       delete configIniJson['hw.lcd.height'];
       delete configIniJson['hw.lcd.width'];
@@ -130,7 +131,9 @@ class VvdManager {
       delete configIniJson['skin.name'];
       delete configIniJson['skin.path'];
     }
-
+    if (marketName) {
+      configIniJson['product.marketname'] = marketName;
+    }
     // 默认使用 'image.sysdir.2' 自定义使用 'image.sysdir.1'
     configIniJson['image.sysdir.2'] = imagePath;
     try {
@@ -181,8 +184,7 @@ class VvdManager {
       width: '',
       skin: '',
       imageDir: '',
-      customLcdRadius: '',
-      imageType: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5
+      customLcdRadius: ''
     };
     let currVvdDir = this.getVvdDir(vvdName);
     const configIni = _path.default.resolve(currVvdDir, 'config.ini');
@@ -368,13 +370,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 +400,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 +455,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
@@ -513,13 +532,33 @@ class VvdManager {
     const onErrout = options.stderrCallback || console.log;
     const e = runningVvds.find(e => e['avd.name'] === vvdName);
     const vvdInfo = this.getVvdInfo(vvdName);
+    const getImageType = async serial => {
+      if (vvdInfo.imageType) return vvdInfo.imageType;
+      // 如果不是通过 IDE 创建的模拟器，没有 imageType 字段，需要智能嗅探镜像类型
+      try {
+        const res = await (0, _adb.execAdbCmdAsync)(`adb -s emulator-${serial} shell uname -a`, {
+          timeout: 3000,
+          encoding: 'utf-8'
+        });
+        if (res.includes('miwear')) {
+          return _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5;
+        }
+        if (res.includes('smartspeaker')) {
+          return _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5;
+        }
+      } catch (error) {
+        return _Vvd.VelaImageType.VELA_WATCH_5;
+      }
+      return _Vvd.VelaImageType.VELA_WATCH_5;
+    };
 
     // 该模拟器已经启动，则创建一个日志流返回
     if (e) {
       // 找出来它原来使用的 debugPort
       const regex = /hostfwd=tcp:(.*?):(\d+)-10\.0\.2\.15:101/;
       const debugPort = e.cmdline?.match(regex)?.[2];
-      const emulatorInstance = (0, _instance.findInstance)(vvdInfo.imageType, {
+      const imageType = await getImageType(e['port.serial']);
+      const emulatorInstance = (0, _instance.findInstance)(imageType, {
         serialPort: e['port.serial'],
         vvdName: vvdName,
         onStdout,
@@ -527,11 +566,16 @@ class VvdManager {
         debugPort,
         customLogger: options.customLogger
       });
+      const velaAgent = (0, _grpc.createGrpcClient)(e);
+      await velaAgent.waitForReady();
+      emulatorInstance.xmsStatus.resolve();
       return {
         coldBoot: false,
         emulatorInstance,
         getAgent: () => (0, _grpc.createGrpcClient)(e),
-        grpcConfig: e
+        grpcConfig: e,
+        velaAgent,
+        imageType
       };
     }
 
@@ -540,65 +584,85 @@ class VvdManager {
     const spawnArgs = cmd.split(' ');
     const spawnBin = spawnArgs.shift();
     logger(`Start CMD: ${cmd}`);
-    const InstanceCalss = (0, _instance.getInstanceClass)(vvdInfo.imageType);
-    const func = InstanceCalss.isEmulatorStarted.bind(InstanceCalss);
-    return new Promise((resolve, reject) => {
-      const emulatorProcess = (0, _child_process.spawn)(spawnBin, spawnArgs, {
-        stdio: 'pipe',
-        shell: true,
-        cwd: this.sdkHome
-      });
-      if (options.origin === _Instance.IStartOrigin.Terminal) {
-        process.stdin.pipe(emulatorProcess.stdin);
-      }
-
-      // 利用 readline 接口可解决子进程日志换行的问题
-      const readlines = (0, _logcat.attachReadline)(emulatorProcess, onStdout, onErrout);
-      const emulatorStartedHandler = msg => {
-        if (func(msg)) {
-          const e = (0, _emulatorutil.getRunningAvdConfigByName)(vvdName);
-          if (e) {
-            const emulatorInstance = (0, _instance.findInstance)(vvdInfo.imageType, {
-              serialPort: e['port.serial'],
-              vvdName: vvdName,
-              logcatProcess: emulatorProcess,
-              ...readlines,
-              onStdout,
-              onErrout,
-              debugPort: options.debugPort,
-              customLogger: options.customLogger
-            });
-            logger(`${options.vvdName} started successfully`);
-            readlines.stdoutReadline.off('line', emulatorStartedHandler);
-            resolve({
-              coldBoot: true,
-              emulatorInstance,
-              getAgent: () => (0, _grpc.createGrpcClient)(e),
-              grpcConfig: e
-            });
+    const {
+      resolve,
+      reject,
+      promise
+    } = Promise.withResolvers();
+    const emulatorProcess = (0, _child_process.spawn)(spawnBin, spawnArgs, {
+      stdio: 'pipe',
+      shell: true,
+      cwd: this.sdkHome
+    });
+    if (options.origin === _Instance.IStartOrigin.Terminal) {
+      process.stdin.pipe(emulatorProcess.stdin);
+    }
+    // 利用 readline 接口可解决子进程日志换行的问题
+    const readlines = (0, _logcat.attachReadline)(emulatorProcess, onStdout, onErrout);
+    const emulatorStartedHandler = async msg => {
+      if (msg.includes('INFO    | Boot completed')) {
+        const e = (0, _emulatorutil.getRunningAvdConfigByName)(vvdName);
+        if (e) {
+          const imageType = await getImageType(e['port.serial']);
+          const emulatorInstance = (0, _instance.findInstance)(imageType, {
+            serialPort: e['port.serial'],
+            vvdName: vvdName,
+            logcatProcess: emulatorProcess,
+            ...readlines,
+            onStdout,
+            onErrout,
+            debugPort: options.debugPort,
+            customLogger: options.customLogger
+          });
+          readlines.stdoutReadline.off('line', emulatorStartedHandler);
+          const velaAgent = (0, _grpc.createGrpcClient)(e);
+          await velaAgent.waitForReady();
+          if (imageType.includes('miwear')) {
+            // 这个时候系统启动成功了，但是 rpk 安装程序还没准备好
+
+            const miwearXmsReadyHander = msg => {
+              const startedFunc = emulatorInstance.isXmsInited.bind(emulatorInstance);
+              if (startedFunc(msg)) {
+                readlines.stdoutReadline.off('line', miwearXmsReadyHander);
+                emulatorInstance.xmsStatus.resolve();
+              }
+            };
+            readlines.stdoutReadline.on('line', miwearXmsReadyHander);
           } else {
-            reject('get emulator running config failed');
+            emulatorInstance.xmsStatus.resolve();
           }
+          logger(`${options.vvdName} started successfully`);
+          resolve({
+            coldBoot: true,
+            emulatorInstance,
+            getAgent: () => (0, _grpc.createGrpcClient)(e),
+            grpcConfig: e,
+            velaAgent,
+            imageType
+          });
+        } else {
+          reject('get emulator running config failed');
         }
-      };
-      readlines.stdoutReadline.on('line', emulatorStartedHandler);
+      }
+    };
+    readlines.stdoutReadline.on('line', emulatorStartedHandler);
 
-      // 监听模拟器的退出事件
-      emulatorProcess.on('exit', code => {
-        logger(`${options.vvdName} emulator exited with code ${code}`);
-        if (options.exitCallback) {
-          options.exitCallback(code);
-        }
-        readlines.dispose();
-        reject();
-      });
+    // 监听模拟器的退出事件
+    emulatorProcess.on('exit', code => {
+      logger(`${options.vvdName} emulator exited with code ${code}`);
+      if (options.exitCallback) {
+        options.exitCallback(code);
+      }
+      readlines.dispose();
+      reject();
+    });
 
-      // 监听模拟器的错误事件
-      emulatorProcess.on('error', err => {
-        readlines.dispose();
-        reject(err);
-      });
+    // 监听模拟器的错误事件
+    emulatorProcess.on('error', err => {
+      readlines.dispose();
+      reject(err);
     });
+    return promise;
   }
   stopVvd(name) {
     let timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10 * 1000;
@@ -774,14 +838,17 @@ class VvdManager {
    */
   async downloadSDK(opt) {
     const updateList = opt.force ? Object.values(_Vvd.SDKParts) : await this.hasSDKPartUpdate();
-    let urls = updateList.map(t => ({
-      name: t,
-      url: (0, _constants.getSDKPartDownloadUrl)(t)
-    }));
+    let urls = [];
+    for (const t of updateList) {
+      urls.push({
+        name: t,
+        url: await (0, _constants.getSDKPartDownloadUrl)(t)
+      });
+    }
     if (opt.imageTypeArr) {
       for (const imgType of opt.imageTypeArr) {
         const needsUpdate = await this.isLocalImageNeedUpdate(imgType);
-        const downloadUrl = (0, _constants.getImageDownloadUrl)()[imgType];
+        const downloadUrl = (await (0, _constants.getImageDownloadUrl)())[imgType];
         // 需要更新并且urls中不存在则添加
         if (needsUpdate && urls.findIndex(u => u.url === downloadUrl) < 0) {
           urls.push({
@@ -843,7 +910,7 @@ class VvdManager {
 
   /** 下载vela系统镜像 */
   async downloadImage(imageId, opt) {
-    const downloadUrls = (0, _constants.getImageDownloadUrl)();
+    const downloadUrls = await (0, _constants.getImageDownloadUrl)();
     const u = downloadUrls[imageId];
     const downloader = await (await ipull).downloadFile({
       url: u,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.6-beta.3",
+  "version": "2.0.6-beta.5",
   "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.5",
     "@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": "d40eba7eacc8334bce1e952c39365513a171719e"
 }