@aiot-toolkit/emulator 2.0.6-beta.8 → 2.1.0-prender.1

package/lib/broker/index.d.ts

@@ -0,0 +1,21 @@
+import Aedes from 'aedes';
+import { TlsOptions } from 'tls';
+import { IncomingMessage, ServerResponse, Server as HttpServer } from 'http';
+export interface BrokerOptions {
+    preferredMqttPort?: number;
+    preferredHttpPort?: number;
+    tlsDir?: string;
+    host?: string;
+    onHttpRequest?: (req: IncomingMessage, res: ServerResponse) => boolean;
+}
+export interface BrokerInstance {
+    aedes: Aedes;
+    mqttPort: number;
+    httpPort: number;
+    mqttHost: string;
+    tlsOptions: TlsOptions;
+    httpServer: HttpServer;
+    close(): Promise<void>;
+}
+export declare function getLocalIP(): string;
+export declare function startBroker(options?: BrokerOptions): Promise<BrokerInstance>;

package/lib/broker/index.js

@@ -0,0 +1,98 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLocalIP = getLocalIP;
+exports.startBroker = startBroker;
+var _aedes = _interopRequireDefault(require("aedes"));
+var _tls = require("tls");
+var _http = require("http");
+var _path = _interopRequireDefault(require("path"));
+var _fs = _interopRequireDefault(require("fs"));
+var _os = _interopRequireDefault(require("os"));
+var _aedesPersistence = _interopRequireDefault(require("aedes-persistence"));
+var _selfsigned = _interopRequireDefault(require("selfsigned"));
+var _constants = require("../emulatorutil/constants");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function getLocalIP() {
+  const interfaces = _os.default.networkInterfaces();
+  const skip = ['VMware', 'VirtualBox', 'Hyper-V', 'DockerNAT', 'vEthernet', 'WSL', 'Parallels'];
+  for (const name in interfaces) {
+    if (skip.some(s => name.includes(s))) continue;
+    for (const alias of interfaces[name] ?? []) {
+      if (alias.family === 'IPv4' && !alias.internal) return alias.address;
+    }
+  }
+  return '127.0.0.1';
+}
+function ensureTlsCerts(tlsDir) {
+  const keyPath = _path.default.join(tlsDir, 'key.pem');
+  const certPath = _path.default.join(tlsDir, 'cert.pem');
+  if (!_fs.default.existsSync(keyPath) || !_fs.default.existsSync(certPath)) {
+    const pems = _selfsigned.default.generate([{
+      name: 'commonName',
+      value: 'localhost'
+    }], {
+      days: 365
+    });
+    _fs.default.mkdirSync(tlsDir, {
+      recursive: true
+    });
+    _fs.default.writeFileSync(keyPath, pems.private);
+    _fs.default.writeFileSync(certPath, pems.cert);
+  }
+  return {
+    key: _fs.default.readFileSync(keyPath),
+    cert: _fs.default.readFileSync(certPath),
+    rejectUnauthorized: false
+  };
+}
+async function startBroker(options) {
+  const {
+    preferredMqttPort = 1884,
+    preferredHttpPort = 8883,
+    tlsDir = _path.default.join(_constants.defaultSDKHome, 'tls'),
+    host,
+    onHttpRequest
+  } = options ?? {};
+  const mqttHost = host ?? getLocalIP();
+  const persistence = (0, _aedesPersistence.default)();
+  const aedes = new _aedes.default({
+    persistence,
+    queueLimit: 80
+  });
+  const tlsOptions = ensureTlsCerts(tlsDir);
+  const tlsServer = (0, _tls.createServer)(tlsOptions, aedes.handle);
+  const httpServer = (0, _http.createServer)((req, res) => {
+    if (onHttpRequest?.(req, res)) return;
+    res.statusCode = 404;
+    res.end();
+  });
+  const getPort = (await import('get-port')).default;
+  const mqttPort = await getPort({
+    port: preferredMqttPort
+  });
+  const httpPort = await getPort({
+    port: preferredHttpPort
+  });
+  await new Promise((resolve, reject) => {
+    tlsServer.once('error', reject);
+    tlsServer.listen(mqttPort, '0.0.0.0', () => {
+      httpServer.listen(httpPort, '0.0.0.0', () => resolve());
+    });
+  });
+  return {
+    aedes,
+    mqttPort,
+    httpPort,
+    mqttHost,
+    tlsOptions,
+    httpServer,
+    async close() {
+      await new Promise(r => httpServer.close(() => r()));
+      await new Promise(r => tlsServer.close(() => r()));
+      aedes.close();
+    }
+  };
+}

package/lib/emulatorutil/constants.js

@@ -27,7 +27,6 @@ Object.defineProperty(exports, "isVelaImageType", {
 });
 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");
@@ -51,15 +50,8 @@ async function getSdkUrl() {
   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();
-    });
+  await fetch(`${base}/versions.json`).catch(() => {
+    base = externalBaseUrl;
   });
   return {
     baseUrl: base,
@@ -77,40 +69,47 @@ async function getSdkUrl() {
  * vela-dev-0.0.4   ： vela 4.0 dev 分支
  */
 const VelaImageVersionList = exports.VelaImageVersionList = [{
-  label: 'vela-miwear-watch-5.0',
+  label: 'vela-miwear-watch-5',
   description: '适用于手表/手环的，带表盘的 vela 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5,
-  time: '20250716',
+  time: '20260130',
   hide: false,
   icon: ''
 }, {
-  label: 'vela-watch-5.0',
+  label: 'vela-watch-5',
   description: '适用于手表/手环的，不带表盘的 vela 5.0 镜像，可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_WATCH_5,
-  time: '20250716',
+  time: '20260422',
   hide: false,
   icon: ''
 }, {
-  label: 'vela-miwear-watch-4.0',
+  label: 'vela-miwear-watch-4',
   description: '原 vela-release-4.0 版本,适用于手表/手环的，带表盘的 vela 4.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.REL,
   time: '20250526',
   hide: false,
   icon: ''
 }, {
-  label: 'vela-watch-4.0',
+  label: 'vela-watch-4',
   description: '原 vela-pre-4.0 版本，适用于手表/手环的，不带表盘的 vela 4.0 镜像，可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.PRE,
   time: '20250225',
   hide: false,
   icon: ''
 }, {
-  label: 'vela-miwear-minisound-5.0',
+  label: 'vela-miwear-minisound-5',
   description: '适用于音响的 vela-miwear 5.0 镜像，不可自定义模拟器尺寸',
   value: _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5,
   time: '20250318',
   hide: true,
   icon: ''
+}, {
+  label: 'openvela-smartspeaker-5',
+  description: '适用于音响的 vela-miwear 5.0 镜像，不可自定义模拟器尺寸',
+  value: _Vvd.VelaImageType.OPENVELA_SMARTSPEAKER_5,
+  time: '20260128',
+  hide: true,
+  icon: ''
 }];
 const EmulatorEnvVersion = exports.EmulatorEnvVersion = {
   name: '模拟器资源版本管理',

package/lib/index.d.ts

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

package/lib/index.js

@@ -19,6 +19,18 @@ Object.defineProperty(exports, "tryRun", {
     return _utils.tryRun;
   }
 });
+var _broker = require("./broker");
+Object.keys(_broker).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _broker[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _broker[key];
+    }
+  });
+});
 var _vvd = require("./vvd");
 Object.keys(_vvd).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/instance/common.d.ts

@@ -1,3 +1,4 @@
+import 'core-js/actual/promise/with-resolvers';
 import readline from 'readline';
 import { IEmulatorInstanceParams } from '../typing/Instance';
 import { VelaImageType } from '../typing/Vvd';

package/lib/instance/common.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/actual/promise/with-resolvers");
 var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 var _ILog = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
 var _adb = _interopRequireWildcard(require("@miwt/adb"));

package/lib/instance/index.d.ts

@@ -7,7 +7,8 @@ import { IEmulatorInstanceParams } from '../typing/Instance';
 import { Vela5Instance } from './vela5';
 import { VelaMiwear5 } from './miwear5';
 import { MiniSound5 } from './minisound';
-declare function getInstanceClass(imageType: VelaImageType): typeof GoldfishInstance | typeof MiwearInstance | typeof PreInstance | typeof Vela5Instance | typeof VelaMiwear5 | typeof MiniSound5;
+import { OpenSmartspeaker5 } from './openSmartspeaker5';
+declare function getInstanceClass(imageType: VelaImageType): typeof GoldfishInstance | typeof MiwearInstance | typeof PreInstance | typeof Vela5Instance | typeof VelaMiwear5 | typeof MiniSound5 | typeof OpenSmartspeaker5;
 /**
  * 根据镜像决定使用哪个instance
  * Vela正式版(4.0) -> MiwearInstance

package/lib/instance/index.js

@@ -43,6 +43,7 @@ var _Vvd = require("../typing/Vvd");
 var _vela = require("./vela5");
 var _miwear2 = require("./miwear5");
 var _minisound = require("./minisound");
+var _openSmartspeaker = require("./openSmartspeaker5");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function getInstanceClass(imageType) {
   const map = {
@@ -51,7 +52,8 @@ function getInstanceClass(imageType) {
     [_Vvd.VelaImageType.DEV]: _dev.default,
     [_Vvd.VelaImageType.VELA_WATCH_5]: _vela.Vela5Instance,
     [_Vvd.VelaImageType.VELA_MIWEAR_WATCH_5]: _miwear2.VelaMiwear5,
-    [_Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5]: _minisound.MiniSound5
+    [_Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5]: _minisound.MiniSound5,
+    [_Vvd.VelaImageType.OPENVELA_SMARTSPEAKER_5]: _openSmartspeaker.OpenSmartspeaker5
   };
   return map[imageType] || _miwear2.VelaMiwear5;
 }

package/lib/instance/minisound.js

@@ -13,7 +13,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 class MiniSound5 extends _miwear.VelaMiwear5 {
   imageType = (() => _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5)();
   appDir = '/data/app';
-  xmsInitedFlag = /Boot completed/;
+  xmsInitedFlag = /AMS/;
   static appStartedFlag = /Start main loop/;
 
   /**

package/lib/instance/miwear.d.ts

@@ -7,6 +7,7 @@ import { VelaImageType } from '../typing/Vvd';
 declare class MiwearInstance extends CommonEmulatorInstance {
     xmsInitedFlag: RegExp;
     static appInstalledFlag: RegExp;
+    static appInstallFailedFlag: RegExp;
     imageType: VelaImageType;
     appDir: string;
     static isAppInstalled(log: string, targetRpk: string): boolean;

package/lib/instance/miwear.js

@@ -20,12 +20,15 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 class MiwearInstance extends _common.default {
   xmsInitedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
   static appInstalledFlag = /InstallState_Finished|install finished/;
+  static appInstallFailedFlag = /uv_mq_read_cb: install prepare failed|rpk_install_status: rpk install failed/;
   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`);
+    // 旧版本日志格式：executeInstall: rpk install: <rpk> ... success
+    // 新版本日志格式：rpk_install_status: rpk file [<rpk>] installed, cleanup it
+    const reg = new RegExp(`executeInstall: rpk install: ${escapedRpk} .* success` + `|rpk_install_status: rpk file \\[${escapedRpk}\\] installed`);
     return reg.test(log);
   }
   /**

package/lib/instance/openSmartspeaker5.d.ts

@@ -0,0 +1,19 @@
+import { VelaImageType } from '../typing/Vvd';
+import { VelaMiwear5 } from './miwear5';
+export declare class OpenSmartspeaker5 extends VelaMiwear5 {
+    imageType: VelaImageType;
+    appDir: string;
+    xmsInitedFlag: RegExp;
+    static appStartedFlag: RegExp;
+    /**
+     * 使用 pm 安装快应用
+     * @param targeRpk 快应用的rpk文件路径
+     */
+    install(targeRpk: string): Promise<void>;
+    /**
+     * 使用 pm 卸载快应用
+     * @param packageName 快应用的包名
+     */
+    uninstall(packageName: string): Promise<void>;
+    reloadApp(appPackageName: string): Promise<void>;
+}

package/lib/instance/openSmartspeaker5.js

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.OpenSmartspeaker5 = void 0;
+var _Vvd = require("../typing/Vvd");
+var _utils = require("../utils");
+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 OpenSmartspeaker5 extends _miwear.VelaMiwear5 {
+  imageType = (() => _Vvd.VelaImageType.OPENVELA_SMARTSPEAKER_5)();
+  appDir = '/data/app';
+  xmsInitedFlag = /AMS/;
+  static appStartedFlag = /Start main loop/;
+
+  /**
+   * 使用 pm 安装快应用
+   * @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);
+    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 {
+      return Promise.reject(res);
+    }
+  }
+
+  /**
+   * 使用 pm 卸载快应用
+   * @param 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 {
+      return Promise.reject(res);
+    }
+  }
+  async reloadApp(appPackageName) {
+    await this.xmsStatus.promise;
+    try {
+      // 2. 执行am stop和am start命令
+      const stopCmd = `adb -s ${this.sn} shell am stop ${appPackageName}`;
+      await adbMiwt.execAdbCmdAsync(stopCmd);
+      this.logger(`Stop ${this.vvdName} ${appPackageName} successfully`);
+      // 这里是为了等am stop命令清除资源等
+      await (0, _utils.sleep)(1500);
+      const startCmd = `adb -s ${this.sn} shell am start ${appPackageName}`;
+      await adbMiwt.execAdbCmdAsync(startCmd);
+      this.logger(`Start ${this.vvdName} ${appPackageName} successfully`);
+    } catch (e) {
+      this.logger(`${e}`);
+    }
+  }
+}
+exports.OpenSmartspeaker5 = OpenSmartspeaker5;

package/lib/instance/vela5.js

@@ -15,7 +15,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class Vela5Instance extends _miwear.default {
   xmsInitedFlag = /booting completed|Boot completed/;
-  static appStartedFlag = /Start main loop/;
+  static appStartedFlag = /Start main loop|reportActivityStatus called by .+? \[resumed\]/;
   imageType = (() => _Vvd.VelaImageType.VELA_WATCH_5)();
   appDir = '/data/app';
 

package/lib/typing/Vvd.d.ts

@@ -4,9 +4,11 @@ export interface IVvdResourcePaths {
     imageHome?: string;
 }
 export declare enum IVvdArchType {
-    arm = "arm"
+    arm = "arm",
+    arm64 = "arm64"
 }
 export declare enum VelaImageType {
+    OPENVELA_SMARTSPEAKER_5 = "openvela-smartspeaker-5.0",
     VELA_MIWEAR_MINISOUND_5 = "vela-miwear-minisound-5.0",
     VELA_MIWEAR_WATCH_5 = "vela-miwear-watch-5.0",
     VELA_WATCH_5 = "vela-watch-5.0",

package/lib/typing/Vvd.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.VelaImageType = exports.VELAHOME = exports.SDKParts = exports.IVvdArchType = void 0;
 let IVvdArchType = exports.IVvdArchType = /*#__PURE__*/function (IVvdArchType) {
   IVvdArchType["arm"] = "arm";
+  IVvdArchType["arm64"] = "arm64";
   return IVvdArchType;
 }({});
 let VelaImageType = exports.VelaImageType = /*#__PURE__*/function (VelaImageType) {
+  VelaImageType["OPENVELA_SMARTSPEAKER_5"] = "openvela-smartspeaker-5.0";
   VelaImageType["VELA_MIWEAR_MINISOUND_5"] = "vela-miwear-minisound-5.0";
   VelaImageType["VELA_MIWEAR_WATCH_5"] = "vela-miwear-watch-5.0";
   VelaImageType["VELA_WATCH_5"] = "vela-watch-5.0";

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

@@ -1,3 +1,4 @@
+import 'core-js/actual/promise/with-resolvers';
 import { Readable } from 'stream';
 import { GrpcClient } from './types/GrpcClient';
 import { EmulatorConfig } from '../../emulatorutil/running';

package/lib/vvd/grpc/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GrpcEmulator = exports.AuthorizationKey = void 0;
 exports.createGrpcClient = createGrpcClient;
+require("core-js/actual/promise/with-resolvers");
 var _path = _interopRequireDefault(require("path"));
 var _protoLoader = require("@grpc/proto-loader");
 var _grpcError = require("./grpcError");

package/lib/vvd/index.d.ts

@@ -1,3 +1,4 @@
+import 'core-js/actual/promise/with-resolvers';
 import { IVvdParams, IVvdResourcePaths, SDKParts, SDKDownloadOpt, SkinInfo, VelaImageType } from '../typing/Vvd';
 import { IStartOptions, IStartWithSerialPort } from '../typing/Instance';
 import { EmulatorConfig } from '../emulatorutil';

package/lib/vvd/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isHeadlessEnvironment = exports.VvdManager = void 0;
+require("core-js/actual/promise/with-resolvers");
 var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 var _promises = _interopRequireDefault(require("fs/promises"));
 var _fs = _interopRequireDefault(require("fs"));
@@ -134,8 +135,7 @@ class VvdManager {
     if (marketName) {
       configIniJson['product.marketname'] = marketName;
     }
-    // 默认使用 'image.sysdir.2' 自定义使用 'image.sysdir.1'
-    configIniJson['image.sysdir.2'] = imagePath;
+    configIniJson['image.sysdir.1'] = imagePath;
     try {
       _fs.default.mkdirSync(vvdDir, {
         recursive: true
@@ -196,8 +196,8 @@ class VvdManager {
       vvdInfo.width = config['hw.lcd.width'];
       vvdInfo.shape = config['hw.lcd.shape'];
       vvdInfo.skin = config['skin.name'];
-      vvdInfo.imageDir = config['image.sysdir.2'];
-      vvdInfo.customImagePath = config['image.sysdir.1'];
+      vvdInfo.imageDir = config['image.sysdir.1'];
+      vvdInfo.customImagePath = config['ide.image.reset.sysdir'];
       vvdInfo.customLcdRadius = config['ide.lcd.radius'];
       if (config['ide.image.type']) vvdInfo.imageType = config['ide.image.type'];
       if (vvdInfo.skin) {
@@ -321,6 +321,7 @@ class VvdManager {
     const configIni = _path.default.resolve(currVvdDir, 'config.ini');
     const contents = _fs.default.readFileSync(configIni, 'utf-8');
     const config = (0, _ini.parse)(contents);
+    config['ide.image.reset.sysdir'] = config['image.sysdir.1'];
     config['image.sysdir.1'] = target;
     await _fs.default.promises.writeFile(configIni, (0, _ini.stringify)(config));
     const defaultImageHome = config['image.sysdir.1'];
@@ -350,8 +351,7 @@ class VvdManager {
     const config = (0, _ini.parse)(contents);
     const home = this.getSDKPart(_Vvd.SDKParts.SYSTEM_IMAGES);
     let imageDir = _path.default.resolve(home, config['ide.image.type']);
-    config['image.sysdir.2'] = imageDir;
-    delete config['image.sysdir.1'];
+    config['image.sysdir.1'] = imageDir;
     _fs.default.writeFileSync(configIni, (0, _ini.stringify)(config));
   }
   getEmulatorBinPath(sdkHome) {
@@ -421,6 +421,18 @@ class VvdManager {
       needUpdate = true;
       config['image.sysdir.2'] = normalizePath(config['image.sysdir.2'].toString()).replace('.export_dev/system-images', '.vela/sdk/system-images');
     }
+
+    // 不在使用 'image.sysdir.2' 字段，统一使用 'ide.image.reset.sysdir'
+    if (config['image.sysdir.2']) {
+      needUpdate = true;
+      const oldVal = config['image.sysdir.2'];
+      // TODO delete 会造成 image.sysdir.2=  留下一个空值
+      delete config['image.sysdir.2'];
+      if (config['image.sysdir.1']) {
+        config['ide.image.reset.sysdir'] = config['image.sysdir.1'];
+      }
+      config['image.sysdir.1'] = oldVal;
+    }
     if (needUpdate) {
       await _promises.default.writeFile(configIni, (0, _ini.stringify)(config));
       _ColorConsole.default.log(`update ${vvdName} config.ini`);
@@ -439,7 +451,7 @@ class VvdManager {
         length: 100
       }).map((_, i) => 10055 + i)
     }));
-    let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${degbugProt}-10.0.2.15:101`;
+    let portMappingStr = '';
 
     // qemu 配置
     const HOST_9PFS_DIR = _path.default.join(vvdDir, 'share');
@@ -455,7 +467,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 -smp 2`;
+    let qemuOption = `-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting -smp 2`;
 
     // qt windows 配置
     // 在 docker，wls，等无界面平台上用 -no-window ,否则用 -qt-hide-window
@@ -474,9 +486,19 @@ class VvdManager {
     }
     const verboseOption = options.verbose ? `-verbose` : ``;
     // 启动模拟器的命令和参数
-    const cmd = `${emulatorBin} -vela -avd ${options.vvdName} ${serialStr} -show-kernel ${portMappingStr} ${windowOption} ${grpcStr} ${verboseOption} -qemu ${qemuOption}`;
-    const vvdInfo = this.getVvdInfo(vvdName);
+
     await this.oldEmulatorMigrate(vvdName);
+    const vvdInfo = this.getVvdInfo(vvdName);
+
+    // vela4 系列或未指定 imageType 时需要端口转发
+    const v4Types = [_Vvd.VelaImageType.REL, _Vvd.VelaImageType.PRE, _Vvd.VelaImageType.DEV];
+    if (!vvdInfo.imageType || v4Types.includes(vvdInfo.imageType)) {
+      portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${degbugProt}-10.0.2.15:101`;
+    }
+    if (vvdInfo.imageType === _Vvd.VelaImageType.OPENVELA_SMARTSPEAKER_5) {
+      qemuOption = `-device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting -smp 4 -device virtio-gpu-device,xres=480,yres=800,bus=virtio-mmio-bus.5`;
+    }
+    const cmd = `${emulatorBin} -vela -avd ${options.vvdName} ${serialStr} -show-kernel ${portMappingStr} ${windowOption} ${grpcStr} ${verboseOption} -qemu ${qemuOption}`;
     const imageDir = vvdInfo.customImagePath || vvdInfo.imageDir;
     if (!imageDir) {
       const errMsg = `${vvdName} is not supported`;
@@ -540,6 +562,9 @@ class VvdManager {
           timeout: 3000,
           encoding: 'utf-8'
         });
+        if (res.includes('miim-arm64')) {
+          return _Vvd.VelaImageType.OPENVELA_SMARTSPEAKER_5;
+        }
         if (res.includes('miwear')) {
           return _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5;
         }
@@ -600,7 +625,7 @@ class VvdManager {
     // 利用 readline 接口可解决子进程日志换行的问题
     const readlines = (0, _logcat.attachReadline)(emulatorProcess, onStdout, onErrout);
     const emulatorStartedHandler = async msg => {
-      if (msg.includes('INFO    | Boot completed')) {
+      if (msg.includes('INFO    | Boot completed') || msg.includes('[AMS]')) {
         const e = (0, _emulatorutil.getRunningAvdConfigByName)(vvdName);
         if (e) {
           const imageType = await getImageType(e['port.serial']);
@@ -617,9 +642,8 @@ class VvdManager {
           readlines.stdoutReadline.off('line', emulatorStartedHandler);
           const velaAgent = (0, _grpc.createGrpcClient)(e);
           await velaAgent.waitForReady();
-          if (imageType.includes('miwear')) {
+          if ([_Vvd.VelaImageType.VELA_MIWEAR_WATCH_5, _Vvd.VelaImageType.REL].includes(imageType)) {
             // 这个时候系统启动成功了，但是 rpk 安装程序还没准备好
-
             const miwearXmsReadyHander = msg => {
               const startedFunc = emulatorInstance.isXmsInited.bind(emulatorInstance);
               if (startedFunc(msg)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.6-beta.8",
+  "version": "2.1.0-prender.1",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -32,22 +32,26 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.8",
+    "@aiot-toolkit/shared-utils": "2.1.0-prender.1",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
     "@miwt/adb": "0.10.5",
     "adm-zip": "^0.5.16",
+    "aedes": "^0.51.3",
+    "aedes-persistence": "^10.0.0",
+    "core-js": "^3.48.0",
     "dayjs": "^1.11.12",
     "find-process": "^1.4.7",
     "get-port": "^7.1.0",
     "ini": "^4.1.3",
     "ipull": "^3.6.2",
     "portfinder": "^1.0.32",
+    "selfsigned": "^3.0.1",
     "semver": "^7.6.3"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "b9380b1c748324938f84da01d035345116f8d0ba"
+  "gitHead": "8bb39a59fbe7a7c22c1167e69d44c78024330cec"
 }