@aiot-toolkit/emulator 2.0.3-beta.8 → 2.0.3

package/lib/emulatorutil/constants.d.ts

@@ -1,4 +1,4 @@
-import { SDKChildren, VelaImageType } from '../typing/Vvd';
+import { SDKParts, VelaImageType } from '../typing/Vvd';
 export declare const defaultSDKHome: string;
 export declare const defaultVvdHome: string;
 export declare const defaultImageHome: string;
@@ -40,5 +40,5 @@ export declare function getImageDownloadUrl(): Record<VelaImageType, string>;
  * 镜像地址默认返回 REL 版本的地址，如果需要获取其他版本，请使用
  * {@link getImageDownloadUrl}
  */
-export declare function getSDKChildDownloadUrl(type: SDKChildren): string;
+export declare function getSDKPartDownloadUrl(type: SDKParts): string;
 export declare function getDefaultImage(): VelaImageType;

package/lib/emulatorutil/constants.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 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.getDefaultImage = getDefaultImage;
 exports.getImageDownloadUrl = getImageDownloadUrl;
-exports.getSDKChildDownloadUrl = getSDKChildDownloadUrl;
+exports.getSDKPartDownloadUrl = getSDKPartDownloadUrl;
 exports.versionUrl = exports.systemImageBaseUrl = void 0;
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
@@ -38,13 +38,13 @@ const systemImageBaseUrl = exports.systemImageBaseUrl = 'https://vela-ide.cnbj3-
 const VelaImageVersionList = exports.VelaImageVersionList = [{
   label: 'vela-4.0-正式版',
   value: _Vvd.VelaImageType.REL,
-  time: '20241105',
+  time: '20241205',
   hide: false,
   icon: ''
 }, {
   label: 'vela-4.0-测试版',
   value: _Vvd.VelaImageType.PRE,
-  time: '20241105',
+  time: '20241205',
   hide: false,
   icon: ''
 }, {
@@ -64,11 +64,11 @@ const VelaImageVersionList = exports.VelaImageVersionList = [{
 ];
 const EmulatorEnvVersion = exports.EmulatorEnvVersion = {
   name: '模拟器资源版本管理',
-  [_Vvd.SDKChildren.EMULATOR]: '0.0.9',
-  [_Vvd.SDKChildren.QA]: '0.0.1',
-  [_Vvd.SDKChildren.SKINS]: '0.0.7',
-  [_Vvd.SDKChildren.SYSTEM_IMAGES]: VelaImageVersionList[0].time,
-  [_Vvd.SDKChildren.MODEM_SIMULATOR]: '0.0.3'
+  [_Vvd.SDKParts.EMULATOR]: '0.0.9',
+  [_Vvd.SDKParts.QA]: '0.0.1',
+  [_Vvd.SDKParts.SKINS]: '0.0.9',
+  [_Vvd.SDKParts.SYSTEM_IMAGES]: VelaImageVersionList[0].time,
+  [_Vvd.SDKParts.MODEM_SIMULATOR]: '0.0.3'
 };
 
 /** 获取镜像下载地址 */
@@ -84,18 +84,18 @@ function getImageDownloadUrl() {
  * 镜像地址默认返回 REL 版本的地址，如果需要获取其他版本，请使用
  * {@link getImageDownloadUrl}
  */
-function getSDKChildDownloadUrl(type) {
+function getSDKPartDownloadUrl(type) {
   switch (type) {
-    case _Vvd.SDKChildren.EMULATOR:
+    case _Vvd.SDKParts.EMULATOR:
       const systemOs = _os.default.platform();
       const hostArch = (0, _utils.getSystemArch)();
       let hostOs = systemOs === 'win32' ? 'windows' : systemOs;
       return `${emulatorBaseUrl}/v${EmulatorEnvVersion.emulator}/${hostOs}-${hostArch}.zip`;
-    case _Vvd.SDKChildren.SYSTEM_IMAGES:
+    case _Vvd.SDKParts.SYSTEM_IMAGES:
       return getImageDownloadUrl()[_Vvd.VelaImageType.REL];
-    case _Vvd.SDKChildren.QA:
-    case _Vvd.SDKChildren.MODEM_SIMULATOR:
-    case _Vvd.SDKChildren.SKINS:
+    case _Vvd.SDKParts.QA:
+    case _Vvd.SDKParts.MODEM_SIMULATOR:
+    case _Vvd.SDKParts.SKINS:
       return `${baseUrl}/${type}/v${EmulatorEnvVersion[type]}/${type}.zip`;
   }
 }

package/lib/emulatorutil/running.js

@@ -95,7 +95,7 @@ async function getRunningVvds() {
   const config = getRunningAvdConfig();
   // running 文件中的数据可能会因为上次模拟器未正常退出而残留，所以需要过滤一下
   const adbDevices = await (0, _adb.getAdbDevices)();
-  return config.filter(c => adbDevices.some(e => e.sn === `emulator-${c['port.serial']}`));
+  return config.filter(c => adbDevices.some(e => e.sn === `emulator-${c['port.serial']}` && e.status === 'device'));
 }
 function getRunningAvdConfigByName(name) {
   const config = getRunningAvdConfig();

package/lib/instance/common.d.ts

@@ -15,6 +15,7 @@ declare class CommonEmulatorInstance {
     onStdout: (msg: string) => void;
     onErrout: (msg: string) => void;
     logcatProcess: ChildProcessWithoutNullStreams;
+    logger: (log: string) => void;
     constructor(params: IEmulatorInstanceParams);
     /** 推送指定文件 */
     push(sourcePath: string, targetPath: string): Promise<string>;
@@ -26,7 +27,7 @@ declare class CommonEmulatorInstance {
      */
     isConnected(): Promise<boolean>;
     /** 安装应用，留给子类实现 */
-    install(rpkPath: string, packageName?: string): Promise<void>;
+    install(rpkPath: string, packageName: string): Promise<void>;
     /** 卸载应用，留给子类实现 */
     uninstall(packageName: string): Promise<void>;
     /** 启动应用，留给子类实现 */

package/lib/instance/common.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+var _ILog = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
 var _utils = require("../utils");
 var _logcat = require("../vvd/logcat");
@@ -21,6 +22,17 @@ class CommonEmulatorInstance {
     this.onStdout = params.onStdout || console.log;
     this.onErrout = params.onErrout || console.error;
     this.debugPort = params.debugPort || (0, _emulatorutil.getRunningVvdDebugPort)(this.vvdName);
+    if (params.customLogger) {
+      this.logger = msg => {
+        const prefix = _ColorConsole.default.createDefaultPrefix({
+          level: _ILog.Loglevel.INFO,
+          message: msg
+        });
+        params.customLogger(`${prefix[1]} ${msg?.trim()}`);
+      };
+    } else {
+      this.logger = _ColorConsole.default.info;
+    }
     if (params.logcatProcess) {
       this.logcatProcess = params.logcatProcess;
       if (!params.stdoutReadline || !params.stderrReadline) {
@@ -45,16 +57,16 @@ class CommonEmulatorInstance {
   async push(sourcePath, targetPath) {
     // 1. adb push应用的rpk
     const pushCmd = `adb -s ${this.sn} push "${sourcePath}" ${targetPath}`;
-    _ColorConsole.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
+    this.logger(`Excuting: ${pushCmd}`);
     const res = await adbMiwt.execAdbCmdAsync(pushCmd);
-    _ColorConsole.default.info(`### Emulator push result: ${res}`);
+    this.logger(`Push result: ${res}`);
     return targetPath;
   }
   async unzip(zipPath, targetPath) {
     const unzipCmd = `adb -s ${this.sn} shell unzip -o ${zipPath} -d ${targetPath}`;
-    _ColorConsole.default.info(`### Emulator unzip cmd ${unzipCmd}`);
+    this.logger(`Excuting: ${unzipCmd}`);
     const res = await adbMiwt.execAdbCmdAsync(unzipCmd);
-    _ColorConsole.default.info(`### Emulator unzip result: ${res}`);
+    this.logger(`Unzip result: ${res}`);
   }
 
   /** 推送指定 rpk */
@@ -62,9 +74,9 @@ class CommonEmulatorInstance {
     // 1. adb push应用的rpk
     const targetPath = `${this.appDir}/${appPackageName}.rpk`;
     const pushCmd = `adb -s ${this.sn} push "${rpkPath}" ${targetPath}`;
-    _ColorConsole.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
+    this.logger(`Excuting: ${pushCmd}`);
     const res = await adbMiwt.execAdbCmdAsync(pushCmd);
-    _ColorConsole.default.info(`### Emulator push rpk result: ${res}`);
+    this.logger(`Push ${this.vvdName} rpk result: ${res}`);
     return targetPath;
   }
 
@@ -74,7 +86,7 @@ class CommonEmulatorInstance {
   async isConnected() {
     return (0, _utils.tryRun)(async () => {
       const devices = await adbMiwt.getAdbDevices();
-      _ColorConsole.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
+      _ColorConsole.default.log(`adb devices: ${JSON.stringify(devices)}`);
       const curDev = devices.find(t => t.sn === this.sn);
       return curDev?.status === 'device';
     }, 10, 500);
@@ -109,7 +121,7 @@ class CommonEmulatorInstance {
     return new Promise((resolve, reject) => {
       const t = setTimeout(() => {
         (0, _utils.killProcessByCmd)(this.vvdName).then(resolve).catch(e => {
-          reject(`poweroff failed ${e}`);
+          reject(`poweroff ${this.vvdName} failed ${e}`);
         });
       }, timeout);
       adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell poweroff`).then(() => {
@@ -120,7 +132,7 @@ class CommonEmulatorInstance {
           clearTimeout(t);
           resolve();
         }).catch(e => {
-          reject(`poweroff failed ${e}`);
+          reject(`poweroff ${this.vvdName} failed ${e}`);
         });
       });
     });
@@ -132,7 +144,7 @@ class CommonEmulatorInstance {
   /** 重启模拟器 */
   async reboot() {
     const rebootCmd = `adb -s ${this.sn} shell reboot`;
-    _ColorConsole.default.log(`### Emulator ### Excuting adb cmd: ${rebootCmd}`);
+    _ColorConsole.default.log(`Excuting: ${rebootCmd}`);
     await adbMiwt.execAdbCmdAsync(rebootCmd);
     await this.isConnected();
     if (!this.logcatProcess.exitCode !== undefined) {

package/lib/instance/dev.js

@@ -4,13 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
 var _common = _interopRequireDefault(require("./common"));
 var _Vvd = require("../typing/Vvd");
+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; }
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class GoldfishInstance extends _common.default {
   imageType = (() => _Vvd.VelaImageType.DEV)();
   appDir = '/data/app';
@@ -20,10 +19,10 @@ class GoldfishInstance extends _common.default {
     rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;
     const targetPath = `${this.appDir}/${appPackageName}`;
     const mkdirCmd = `adb -s ${this.sn} shell mkdir ${targetPath}`;
-    _ColorConsole.default.info(`### Emulator mkdir cmd ${mkdirCmd}`);
+    this.logger(`Excuting: ${mkdirCmd}`);
     await adbMiwt.execAdbCmdAsync(mkdirCmd);
     const unzipCmd = `adb -s ${this.sn} shell unzip -o ${rpkPath} -d ${targetPath}`;
-    _ColorConsole.default.info(`### Emulator unzip cmd ${unzipCmd}`);
+    this.logger(`Excuting: ${unzipCmd}`);
     await adbMiwt.execAdbCmdAsync(unzipCmd);
   }
 
@@ -39,13 +38,13 @@ class GoldfishInstance extends _common.default {
       if (debug) {
         vappCmd = `adb -s ${this.sn} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
       }
-      _ColorConsole.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
+      this.logger(`Excuting: ${vappCmd}`);
       adbMiwt.execAdbCmd(vappCmd, {
         stdio: 'ignore',
         encoding: 'utf-8'
       });
     } catch (e) {
-      _ColorConsole.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
+      this.logger(`Failed to startup quickapp: ${e.message}`);
     }
   }
   async reloadApp(appName) {

package/lib/instance/miwear.js

@@ -4,16 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
 var _path = _interopRequireDefault(require("path"));
 var _utils = require("../utils");
 var _common = _interopRequireDefault(require("./common"));
 var _emulatorutil = require("../emulatorutil");
 var _Vvd = require("../typing/Vvd");
+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; }
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * MiwearInstance
  * 针对 Vela正式版（4.0）的镜像
@@ -32,13 +31,13 @@ class MiwearInstance extends _common.default {
       const func = msg => {
         if (_emulatorutil.EmulatorLog.inStallIsFinshe(msg)) {
           clearTimeout(timer);
-          _ColorConsole.default.info(`### Emulator ### Install ${targeRpk} successfully`);
+          this.logger(`Install to ${this.vvdName} ${targeRpk} successfully`);
           resolve();
         }
       };
       let timer = setTimeout(() => {
         this.stdoutReadline.off('line', func);
-        _ColorConsole.default.error(`### Emulator ### Install ${targeRpk} timeout`);
+        this.logger(`Install to ${this.vvdName} ${targeRpk} timeout`);
         reject('Install timeout');
       }, 2 * 60 * 1000);
       this.stdoutReadline.on('line', func);
@@ -56,13 +55,13 @@ class MiwearInstance extends _common.default {
       await adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell rm /data/debugger_ip.cfg`);
     }
     const startCmd = `adb -s ${this.sn} shell am start ${packageName}`;
-    _ColorConsole.default.info(`### Emulator ### Excuting cmd: ${startCmd}`);
+    this.logger(`Excuting: ${startCmd}`);
     await adbMiwt.execAdbCmdAsync(startCmd);
   }
   async closeApp(appName) {
     const stopCmd = `adb -s ${this.sn} shell am stop ${appName}`;
     await adbMiwt.execAdbCmdAsync(stopCmd);
-    _ColorConsole.default.info(`### Emulator stop ${appName} successfully`);
+    this.logger(`Stop ${this.vvdName} ${appName} successfully`);
     // 这里是为了等am stop命令清除资源等
   }
   async reboot() {
@@ -76,7 +75,7 @@ class MiwearInstance extends _common.default {
       };
       let timer = setTimeout(() => {
         this.stdoutReadline.off('line', func);
-        _ColorConsole.default.error(`### Emulator ### reboot  timeout`);
+        this.logger(`Reboot ${this.vvdName} timeout`);
         reject('reboot timeout');
       }, 2 * 60 * 1000);
       this.stdoutReadline.on('line', func);
@@ -88,14 +87,14 @@ class MiwearInstance extends _common.default {
       // 2. 执行am stop和am start命令
       const stopCmd = `adb -s ${this.sn} shell am stop ${appPackageName}`;
       await adbMiwt.execAdbCmdAsync(stopCmd);
-      _ColorConsole.default.info(`### Emulator stop ${appPackageName} successfully`);
+      this.logger(`Stop ${this.vvdName} ${appPackageName} successfully`);
       // 这里是为了等am stop命令清除资源等
       await (0, _utils.sleep)(500);
       const startCmd = `adb -s ${this.sn} shell am start ${appPackageName}`;
       await adbMiwt.execAdbCmdAsync(startCmd);
-      _ColorConsole.default.info(`### Emulator start ${appPackageName} successfully`);
+      this.logger(`Start ${this.vvdName} ${appPackageName} successfully`);
     } catch (e) {
-      _ColorConsole.default.error(`${e}`);
+      this.logger(`${e}`);
     }
   }
 }

package/lib/instance/pre.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _dev = _interopRequireDefault(require("./dev"));
-var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
 var _Vvd = require("../typing/Vvd");
 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); }
@@ -22,10 +21,10 @@ class PreInstance extends _dev.default {
     rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;
     const targetPath = `${this.appDir}/${appPackageName}`;
     const mkdirCmd = `adb -s ${this.sn} shell mkdir ${targetPath}`;
-    _ColorConsole.default.info(`### Emulator mkdir cmd ${mkdirCmd}`);
+    this.logger(`Excuting: ${mkdirCmd}`);
     await adbMiwt.execAdbCmdAsync(mkdirCmd);
     const unzipCmd = `adb -s ${this.sn} shell unzip -o ${rpkPath} -d ${targetPath}`;
-    _ColorConsole.default.info(`### Emulator unzip cmd ${unzipCmd}`);
+    this.logger(`Excuting: ${unzipCmd}`);
     await adbMiwt.execAdbCmdAsync(unzipCmd);
   }
 
@@ -41,13 +40,13 @@ class PreInstance extends _dev.default {
       if (debug) {
         vappCmd = `adb -s ${this.sn} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
       }
-      _ColorConsole.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
+      this.logger(`Excuting: ${vappCmd}`);
       adbMiwt.execAdbCmd(vappCmd, {
         stdio: 'ignore',
         encoding: 'utf-8'
       });
     } catch (e) {
-      _ColorConsole.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
+      this.logger(`Failed to startup app for ${this.vvdName}: ${e.message}`);
     }
   }
   async closeApp(_appName) {

package/lib/instance/pre5.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VelaPre5Instance = void 0;
-var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 var _Vvd = require("../typing/Vvd");
 var _miwear = _interopRequireDefault(require("./miwear"));
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
@@ -22,10 +21,10 @@ class VelaPre5Instance extends _miwear.default {
    */
   async install(targeRpk) {
     const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
-    _ColorConsole.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
+    this.logger(`Excuting: ${installCmd}`);
     const res = await adbMiwt.execAdbCmdAsync(installCmd);
     await (0, _util.promisify)(process.nextTick)();
-    _ColorConsole.default.info(`### Emulator ### install result: ${res}`);
+    this.logger(`Install result: ${res}`);
     // vela 5 安装成功的日志为:
     // onInstallResult: com.application.watch.demo(success 0)
     if (res.includes('(success 0)')) {

package/lib/typing/Instance.d.ts

@@ -13,6 +13,7 @@ export interface IEmulatorInstanceParams extends Partial<EmulatorReadlines> {
     onErrout?: (msg: string) => void;
     /** 模拟器日志输出进程 */
     logcatProcess?: ChildProcessWithoutNullStreams;
+    customLogger?: (log: string) => void;
 }
 export interface IStartOptions {
     vvdName: string;
@@ -29,6 +30,7 @@ export interface IStartOptions {
     stdoutCallback?: (buffer: string) => void;
     stderrCallback?: (buffer: string) => void;
     exitCallback?: (code: number | null) => void;
+    customLogger?: (log: string) => void;
 }
 /**
  * 如果指定了 serialPort 则必须同时指定 grpcPort

package/lib/typing/Vvd.d.ts

@@ -88,7 +88,7 @@ export interface EmulatorSkin {
     maskImage: string | undefined;
     defaultLayout: EmulatorLayout;
 }
-export declare enum SDKChildren {
+export declare enum SDKParts {
     EMULATOR = "emulator",
     QA = "qa",
     SKINS = "skins",

package/lib/typing/Vvd.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VelaImageType = exports.VELAHOME = exports.SDKChildren = exports.IVvdArchType = void 0;
+exports.VelaImageType = exports.VELAHOME = exports.SDKParts = exports.IVvdArchType = void 0;
 let IVvdArchType = exports.IVvdArchType = /*#__PURE__*/function (IVvdArchType) {
   IVvdArchType["arm"] = "arm";
   IVvdArchType["arm64"] = "arm64";
@@ -16,13 +16,13 @@ let VelaImageType = exports.VelaImageType = /*#__PURE__*/function (VelaImageType
   VelaImageType["DEV"] = "vela-dev-0.0.4";
   return VelaImageType;
 }({});
-let SDKChildren = exports.SDKChildren = /*#__PURE__*/function (SDKChildren) {
-  SDKChildren["EMULATOR"] = "emulator";
-  SDKChildren["QA"] = "qa";
-  SDKChildren["SKINS"] = "skins";
-  SDKChildren["SYSTEM_IMAGES"] = "system-images";
-  SDKChildren["MODEM_SIMULATOR"] = "modem_simulator";
-  return SDKChildren;
+let SDKParts = exports.SDKParts = /*#__PURE__*/function (SDKParts) {
+  SDKParts["EMULATOR"] = "emulator";
+  SDKParts["QA"] = "qa";
+  SDKParts["SKINS"] = "skins";
+  SDKParts["SYSTEM_IMAGES"] = "system-images";
+  SDKParts["MODEM_SIMULATOR"] = "modem_simulator";
+  return SDKParts;
 }({});
 let VELAHOME = exports.VELAHOME = /*#__PURE__*/function (VELAHOME) {
   VELAHOME["SDK"] = ".export";

package/lib/vvd/index.d.ts

@@ -1,4 +1,4 @@
-import { IVvdParams, IVvdResourcePaths, SDKChildren, SDKDownloadOpt, SkinInfo, VelaImageType } from '../typing/Vvd';
+import { IVvdParams, IVvdResourcePaths, SDKParts, SDKDownloadOpt, SkinInfo, VelaImageType } from '../typing/Vvd';
 import { IStartOptions, IStartWithSerialPort } from '../typing/Instance';
 import { findInstance } from '../instance';
 import type { DownloadFileOptions } from 'ipull';
@@ -23,7 +23,7 @@ export declare class VvdManager {
     /** 获取已经创建的模拟器列表 */
     getVvdList(): IVvdParams[];
     /** 获取 SDK 子目录 */
-    getSDKChild(name: SDKChildren): string;
+    getSDKPart(name: SDKParts): string;
     getSkinInfo(skinName: string, skinPath: string): {
         name: string;
         path: string;
@@ -58,7 +58,7 @@ export declare class VvdManager {
     getLocalImageBuildTime(imagePath: string): Promise<Date | undefined>;
     getSDKVersionPath(): string;
     /** 获取本地 SDK 的版本信息 */
-    getSDKVersion(): Promise<Record<SDKChildren, string>>;
+    getSDKVersion(): Promise<Record<SDKParts, string>>;
     /** 获取本地已经下载的镜像 */
     getLocalSystemImage(): Promise<{
         value: string;
@@ -68,9 +68,9 @@ export declare class VvdManager {
     hasLocaleImage(imageId: VelaImageType): boolean;
     /** 判断本地的某个 vela 镜像是否需要更新 */
     isLocalImageNeedUpdate(imageId: VelaImageType): Promise<boolean>;
-    getNotInstalledSDKPart(): Promise<SDKChildren[]>;
+    getNotInstalledSDKPart(): Promise<SDKParts[]>;
     /** 检查 SDK 有哪些部分需要更新 */
-    hasSDKChildrenUpdate(): Promise<SDKChildren[]>;
+    hasSDKPartUpdate(): Promise<SDKParts[]>;
     /**
      * 下载 SDK，默认只下载需要更新的部分
      * @param opt.force 强制下载所有部分

package/lib/vvd/index.js

@@ -24,6 +24,7 @@ var _admZip = _interopRequireDefault(require("adm-zip"));
 var _instance = require("../instance");
 var _logcat = require("./logcat");
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _ILog = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // TODO: 升级构建工具支持 esm @xujunjie
 const getPort = (async () => {
@@ -125,7 +126,7 @@ class VvdManager {
       }
 
       // 拷贝 MODEM_SIMULATOR
-      const modemPath = this.getSDKChild(_Vvd.SDKChildren.MODEM_SIMULATOR);
+      const modemPath = this.getSDKPart(_Vvd.SDKParts.MODEM_SIMULATOR);
       if (_fs.default.existsSync(modemPath)) {
         _sharedUtils.FileUtil.copyFiles(modemPath, _path.default.join(vvdDir, 'modem_simulator'));
       }
@@ -148,6 +149,7 @@ class VvdManager {
     const vvdInfo = {
       name: vvdName,
       arch: _Vvd.IVvdArchType.arm,
+      shape: '',
       height: '',
       width: '',
       skin: '',
@@ -163,6 +165,7 @@ class VvdManager {
       vvdInfo.arch = config['hw.cpu.arch'];
       vvdInfo.height = config['hw.lcd.height'];
       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'];
@@ -217,7 +220,7 @@ class VvdManager {
   }
 
   /** 获取 SDK 子目录 */
-  getSDKChild(name) {
+  getSDKPart(name) {
     return _path.default.resolve(this.sdkHome, name);
   }
   getSkinInfo(skinName, skinPath) {
@@ -248,7 +251,7 @@ class VvdManager {
   async getVelaSkinList() {
     try {
       const skinList = [];
-      const skinHome = this.getSDKChild(_Vvd.SDKChildren.SKINS);
+      const skinHome = this.getSDKPart(_Vvd.SDKParts.SKINS);
       const builinDir = _path.default.join(skinHome, 'builtin');
       const userDir = _path.default.join(skinHome, 'user');
       const builtinFiles = await _fs.default.promises.readdir(builinDir).catch(() => []);
@@ -364,13 +367,25 @@ class VvdManager {
     }
 
     // 拷贝 MODEM_SIMULATOR
-    const modemPath = this.getSDKChild(_Vvd.SDKChildren.MODEM_SIMULATOR);
+    const modemPath = this.getSDKPart(_Vvd.SDKParts.MODEM_SIMULATOR);
     if (_fs.default.existsSync(modemPath) && !_fs.default.existsSync(_path.default.join(vvdDir, 'modem_simulator', 'modem_nvram.json'))) {
       _sharedUtils.FileUtil.copyFiles(modemPath, _path.default.join(vvdDir, 'modem_simulator'));
     }
     return cmd;
   }
   async startVvd(options) {
+    let logger;
+    if (options.customLogger) {
+      logger = msg => {
+        const prefix = _ColorConsole.default.createDefaultPrefix({
+          level: _ILog.Loglevel.INFO,
+          message: msg
+        });
+        options.customLogger(`${prefix[1]} ${msg?.trim()}`);
+      };
+    } else {
+      logger = _ColorConsole.default.info;
+    }
     const runningVvds = await (0, _emulatorutil.getRunningVvds)();
     const vvdName = options.vvdName;
     const onStdout = options.stdoutCallback || console.log;
@@ -388,7 +403,8 @@ class VvdManager {
         vvdName: vvdName,
         onStdout,
         onErrout,
-        debugPort
+        debugPort,
+        customLogger: options.customLogger
       });
       return {
         coldBoot: false,
@@ -400,7 +416,7 @@ class VvdManager {
     const cmd = await this.getVvdStartCmd(options);
     const spawnArgs = cmd.split(' ');
     const spawnBin = spawnArgs.shift();
-    _ColorConsole.default.log(`### Emulator ### Start CMD miwear: ${cmd}`);
+    logger(`Start CMD: ${cmd}`);
     const func = vvdInfo.imageType === _Vvd.VelaImageType.REL ? _emulatorutil.EmulatorLog.rpkIsStart : _emulatorutil.EmulatorLog.devIsStart;
     return new Promise((resolve, reject) => {
       const emulatorProcess = (0, _child_process.spawn)(spawnBin, spawnArgs, {
@@ -425,9 +441,10 @@ class VvdManager {
               ...readlines,
               onStdout,
               onErrout,
-              debugPort: options.debugPort
+              debugPort: options.debugPort,
+              customLogger: options.customLogger
             });
-            _ColorConsole.default.info(`### Emulator ### Goldfish emulator starts successfully`);
+            logger(`${options.vvdName} started successfully`);
             resolve({
               coldBoot: true,
               emulatorInstance
@@ -441,7 +458,7 @@ class VvdManager {
 
       // 监听模拟器的退出事件
       emulatorProcess.on('exit', code => {
-        _ColorConsole.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
+        logger(`${options.vvdName} emulator exited with code ${code}`);
         if (options.exitCallback) {
           options.exitCallback(code);
         }
@@ -517,7 +534,7 @@ class VvdManager {
 
   /** 获取本地已经下载的镜像 */
   async getLocalSystemImage() {
-    const home = this.getSDKChild(_Vvd.SDKChildren.SYSTEM_IMAGES);
+    const home = this.getSDKPart(_Vvd.SDKParts.SYSTEM_IMAGES);
     const res = [];
     if (_fs.default.existsSync(home)) {
       const files = _fs.default.readdirSync(home);
@@ -535,7 +552,7 @@ class VvdManager {
     return res;
   }
   getLocalSystemPath(imageId) {
-    const home = this.getSDKChild(_Vvd.SDKChildren.SYSTEM_IMAGES);
+    const home = this.getSDKPart(_Vvd.SDKParts.SYSTEM_IMAGES);
     return _path.default.resolve(home, imageId, 'nuttx');
   }
   hasLocaleImage(imageId) {
@@ -553,8 +570,7 @@ class VvdManager {
     return false;
   }
   async getNotInstalledSDKPart() {
-    const allResouce = Object.values(_Vvd.SDKChildren);
-    const res = [];
+    const allResouce = Object.values(_Vvd.SDKParts);
     try {
       const res = [];
       for (const resouces of allResouce) {
@@ -572,8 +588,8 @@ class VvdManager {
   }
 
   /** 检查 SDK 有哪些部分需要更新 */
-  async hasSDKChildrenUpdate() {
-    const allResouce = Object.values(_Vvd.SDKChildren);
+  async hasSDKPartUpdate() {
+    const allResouce = Object.values(_Vvd.SDKParts);
     try {
       const res = [];
       const localVersion = await this.getSDKVersion();
@@ -583,7 +599,7 @@ class VvdManager {
           res.push(resouces);
           continue;
         }
-        if (resouces === _Vvd.SDKChildren.SYSTEM_IMAGES) {
+        if (resouces === _Vvd.SDKParts.SYSTEM_IMAGES) {
           if (await this.isLocalImageNeedUpdate((0, _constants.getDefaultImage)())) res.push(resouces);
           continue;
         }
@@ -625,10 +641,10 @@ class VvdManager {
    * }
    */
   async downloadSDK(opt) {
-    const updateList = opt.force ? Object.values(_Vvd.SDKChildren) : await this.hasSDKChildrenUpdate();
+    const updateList = opt.force ? Object.values(_Vvd.SDKParts) : await this.hasSDKPartUpdate();
     const urls = updateList.map(t => ({
       name: t,
-      url: (0, _constants.getSDKChildDownloadUrl)(t)
+      url: (0, _constants.getSDKPartDownloadUrl)(t)
     }));
     const downloads = urls.map(async u => {
       const d = await (await ipull).downloadFile({
@@ -646,10 +662,11 @@ class VvdManager {
       if (downloader.downloadStatues.some(status => status.downloadStatus !== 'Finished')) {
         return;
       }
+      _ColorConsole.default.warn('All file resources have been successfully downloaded and are being decompressed.');
       for (const u of urls) {
         // 解压
         const targetDirName = u.name;
-        const targetDir = u.name === _Vvd.SDKChildren.SYSTEM_IMAGES ? _path.default.resolve(this.sdkHome, targetDirName, _path.default.basename(u.url).replace('.zip', '')) : _path.default.resolve(this.sdkHome, targetDirName);
+        const targetDir = u.name === _Vvd.SDKParts.SYSTEM_IMAGES ? _path.default.resolve(this.sdkHome, targetDirName, _path.default.basename(u.url).replace('.zip', '')) : _path.default.resolve(this.sdkHome, targetDirName);
         const targetDirExist = _fs.default.existsSync(targetDir);
         if (!targetDirExist) await _fs.default.promises.mkdir(targetDir, {
           recursive: true
@@ -675,7 +692,7 @@ class VvdManager {
     const u = downloadUrls[imageId];
     const downloader = await (await ipull).downloadFile({
       url: u,
-      directory: this.getSDKChild(_Vvd.SDKChildren.SYSTEM_IMAGES),
+      directory: this.getSDKPart(_Vvd.SDKParts.SYSTEM_IMAGES),
       skipExisting: false,
       ...opt
     });
@@ -683,9 +700,9 @@ class VvdManager {
     const p2 = p.then(async () => {
       //如果下载被取消或者出错，就不再执行后续操作
       if (downloader.status.downloadStatus !== 'Finished') return;
-      const zipFile = _path.default.resolve(this.sdkHome, _Vvd.SDKChildren.SYSTEM_IMAGES, _path.default.basename(u));
+      const zipFile = _path.default.resolve(this.sdkHome, _Vvd.SDKParts.SYSTEM_IMAGES, _path.default.basename(u));
       const zip = new _admZip.default(zipFile);
-      zip.extractAllTo(_path.default.resolve(this.sdkHome, _Vvd.SDKChildren.SYSTEM_IMAGES, imageId), true, true);
+      zip.extractAllTo(_path.default.resolve(this.sdkHome, _Vvd.SDKParts.SYSTEM_IMAGES, imageId), true, true);
       await _fs.default.promises.rm(zipFile, {
         force: true
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.3-beta.8",
+  "version": "2.0.3",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,7 +36,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.3-beta.8",
+    "@aiot-toolkit/shared-utils": "2.0.3",
     "@miwt/adb": "^0.9.0",
     "adm-zip": "^0.5.16",
     "dayjs": "^1.11.12",
@@ -51,5 +51,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "1b1be0a8f4e40978a221fd7dbab4c9a2c168be1e"
+  "gitHead": "e29e61eb89c2559eb9f3a18c51fd5ce4c4196cc2"
 }