@aiot-toolkit/emulator 2.0.6-beta.15 → 2.0.6-beta.17

package/lib/emulatorutil/running.js

@@ -11,8 +11,6 @@ exports.getRunningAvdConfigByName = getRunningAvdConfigByName;
 exports.getRunningAvdConfigFiles = getRunningAvdConfigFiles;
 exports.getRunningVvdDebugPort = getRunningVvdDebugPort;
 exports.getRunningVvds = getRunningVvds;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.array.push.js");
 var _os = _interopRequireDefault(require("os"));
 var _fs = _interopRequireDefault(require("fs"));
 var _ini = _interopRequireDefault(require("ini"));
@@ -112,8 +110,7 @@ function getRunningAvdConfigByName(name) {
   }
 }
 function getRunningVvdDebugPort(name) {
-  var _e$cmdline;
   const e = getRunningAvdConfigByName(name);
   const regex = /hostfwd=tcp:(.*?):(\d+)-10\.0\.2\.15:101/;
-  return e === null || e === void 0 || (_e$cmdline = e.cmdline) === null || _e$cmdline === void 0 || (_e$cmdline = _e$cmdline.match(regex)) === null || _e$cmdline === void 0 ? void 0 : _e$cmdline[2];
+  return e?.cmdline?.match(regex)?.[2];
 }

package/lib/emulatorutil/skinLayoutParser.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Status = exports.ConfigParser = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.array.push.js");
 let Status = exports.Status = /*#__PURE__*/function (Status) {
   Status[Status["NAME"] = 1] = "NAME";
   Status[Status["VALUE"] = 2] = "VALUE";

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,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.promise.with-resolvers.js");
+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"));
@@ -27,8 +26,8 @@ class CommonEmulatorInstance {
   static appInstallFailedFlag = /uv_mq_read_cb: install prepare failed/;
   static appUninstalledFlag = /uninstalled app/;
   static appStartedFlag = /Start App loop/;
-  static isAppInstalled(...args) {
-    const log = args[0];
+  static isAppInstalled() {
+    const log = arguments.length <= 0 ? undefined : arguments[0];
     return this.appInstalledFlag.test(log);
   }
   static isAppInstallFailed(log) {
@@ -52,7 +51,7 @@ class CommonEmulatorInstance {
           level: _ILog.Loglevel.INFO,
           message: msg
         });
-        params.customLogger(`${prefix[1]} ${msg === null || msg === void 0 ? void 0 : msg.trim()}`);
+        params.customLogger(`${prefix[1]} ${msg?.trim()}`);
       };
     } else {
       this.logger = _ColorConsole.default.info;
@@ -130,7 +129,7 @@ class CommonEmulatorInstance {
       const devices = await adbMiwt.getAdbDevices();
       this.logger(`adb devices: ${JSON.stringify(devices)}`);
       const curDev = devices.find(t => t.sn === this.sn);
-      return (curDev === null || curDev === void 0 ? void 0 : curDev.status) === 'device';
+      return curDev?.status === 'device';
     }, 10, 500);
   }
   async pushAndInstall(rpkPath, appName) {
@@ -157,7 +156,8 @@ class CommonEmulatorInstance {
   }
 
   /** 关闭模拟器 */
-  poweroff(timeout = 10 * 1000) {
+  poweroff() {
+    let timeout = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 10 * 1000;
     return new Promise((resolve, reject) => {
       const t = setTimeout(() => {
         (0, _utils.killProcessByCmd)(this.vvdName).then(resolve).catch(e => {

package/lib/instance/dev.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("core-js/modules/es.error.cause.js");
 var adbMiwt = _interopRequireWildcard(require("@miwt/adb"));
 var _common = _interopRequireDefault(require("./common"));
 var _Vvd = require("../typing/Vvd");
@@ -21,7 +20,7 @@ class GoldfishInstance extends _common.default {
   closeApp() {
     throw new Error('Method not implemented.');
   }
-  imageType = _Vvd.VelaImageType.DEV;
+  imageType = (() => _Vvd.VelaImageType.DEV)();
   static appDir = '/data/app';
   static emulatorStartedFlag = /(NSH)/;
   async install(rpkPath, opt) {
@@ -41,7 +40,8 @@ class GoldfishInstance extends _common.default {
    * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
    * @param options
    */
-  async startApp(packageName, debug = false) {
+  async startApp(packageName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     try {
       let vappCmd = `adb -s ${this.sn} shell vapp app/${packageName} &`;
       if (debug) {
@@ -56,7 +56,8 @@ class GoldfishInstance extends _common.default {
       this.logger(`Failed to startup quickapp: ${e.message}`);
     }
   }
-  async reloadApp(appName, debug = false) {
+  async reloadApp(appName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     await this.reboot();
     await this.startApp(appName, debug);
   }

package/lib/instance/minisound.js

@@ -11,7 +11,7 @@ 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;
+  imageType = (() => _Vvd.VelaImageType.VELA_MIWEAR_MINISOUND_5)();
   appDir = '/data/app';
   xmsInitedFlag = /AMS/;
   static appStartedFlag = /Start main loop/;

package/lib/instance/miwear.js

@@ -20,7 +20,7 @@ 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/;
-  imageType = _Vvd.VelaImageType.REL;
+  imageType = (() => _Vvd.VelaImageType.REL)();
   appDir = '/data/quickapp/app';
   static isAppInstalled(log, targetRpk) {
     // 注意：targetRpk 可能包含特殊字符，需要转义
@@ -68,7 +68,7 @@ class MiwearInstance extends _common.default {
         const mu = size / 1024 / 1024;
         return mu < 1 ? 20 * 1000 : mu < 4 ? 60 * 1000 : 2 * 60 * 1000;
       }
-      const timeout = getTimeout(options === null || options === void 0 ? void 0 : options.size);
+      const timeout = getTimeout(options?.size);
       let timer = setTimeout(() => {
         this.stdoutReadline.off('line', func);
         this.logger(`Install to ${this.vvdName} ${targeRpk} timeout`);
@@ -109,7 +109,8 @@ class MiwearInstance extends _common.default {
   }
 
   /** 使用 am start 启动快应用 */
-  async startApp(packageName, debug = false) {
+  async startApp(packageName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     //  等待 xms 服务初始化完成之后才能进行安装
     await this.xmsStatus.promise;
     // 调试模式需要push一个文件至miwear中

package/lib/instance/miwear5.js

@@ -8,7 +8,7 @@ var _Vvd = require("../typing/Vvd");
 var _miwear = _interopRequireDefault(require("./miwear"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class VelaMiwear5 extends _miwear.default {
-  imageType = _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5;
+  imageType = (() => _Vvd.VelaImageType.VELA_MIWEAR_WATCH_5)();
   appDir = '/data/app';
 }
 exports.VelaMiwear5 = VelaMiwear5;

package/lib/instance/openSmartspeaker5.js

@@ -12,7 +12,7 @@ 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;
+  imageType = (() => _Vvd.VelaImageType.OPENVELA_SMARTSPEAKER_5)();
   appDir = '/data/app';
   xmsInitedFlag = /AMS/;
   static appStartedFlag = /Start main loop/;

package/lib/instance/pre.js

@@ -14,7 +14,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * 不带 miwear 的 4.0 镜像
  */
 class PreInstance extends _common.default {
-  imageType = _Vvd.VelaImageType.PRE;
+  imageType = (() => _Vvd.VelaImageType.PRE)();
   appDir = '/data/quickapp/app';
   xmsInitedFlag = /(NSH)/;
   async install(rpkPath, opt) {
@@ -43,7 +43,8 @@ class PreInstance extends _common.default {
    * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
    * @param options
    */
-  async startApp(packageName, debug = false) {
+  async startApp(packageName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     try {
       let vappCmd = `adb -s ${this.sn} shell vapp app/${packageName} &`;
       if (debug) {
@@ -61,7 +62,8 @@ class PreInstance extends _common.default {
   async closeApp() {
     await this.reboot();
   }
-  async reloadApp(appName, debug = false) {
+  async reloadApp(appName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     await this.reboot();
     this.startApp(appName, debug);
   }

package/lib/instance/vela5.js

@@ -16,7 +16,7 @@ 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/;
-  imageType = _Vvd.VelaImageType.VELA_WATCH_5;
+  imageType = (() => _Vvd.VelaImageType.VELA_WATCH_5)();
   appDir = '/data/app';
 
   /**

package/lib/utils/index.js

@@ -82,7 +82,10 @@ async function sleep(time) {
  * @param {Number=} maxCount 最大重试次数
  * @param {number=} duration 每次重试的间隔
  */
-async function tryRun(task, maxCount = 5, duration = 1000, currentCount = 0) {
+async function tryRun(task) {
+  let maxCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5;
+  let duration = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000;
+  let currentCount = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
   if (currentCount > maxCount) return false;
   return Boolean(await task()) || (await delayRun(() => tryRun(task, maxCount, duration, currentCount + 1), duration));
 }
@@ -93,7 +96,8 @@ async function tryRun(task, maxCount = 5, duration = 1000, currentCount = 0) {
  * @param duration
  * @returns
  */
-async function delayRun(task, duration = 1000) {
+async function delayRun(task) {
+  let duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1000;
   return new Promise(resolve => {
     setTimeout(async () => {
       return resolve(task());

package/lib/vvd/grpc/grpcError.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.handleGrpcErrorMsg = handleGrpcErrorMsg;
-require("core-js/modules/es.error.cause.js");
 function handleGrpcErrorMsg(err) {
   if (typeof err === 'string') err = new Error(err);
   console.error(err);

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,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GrpcEmulator = exports.AuthorizationKey = void 0;
 exports.createGrpcClient = createGrpcClient;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.promise.with-resolvers.js");
+require("core-js/actual/promise/with-resolvers");
 var _path = _interopRequireDefault(require("path"));
 var _protoLoader = require("@grpc/proto-loader");
 var _grpcError = require("./grpcError");
@@ -19,7 +18,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const AuthorizationKey = exports.AuthorizationKey = 'Authorization';
 class GrpcEmulator {
   connected = false;
-  constructor(eConf, protoPath, ip = '127.0.0.1') {
+  constructor(eConf, protoPath) {
+    let ip = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '127.0.0.1';
     this.eConf = eConf;
     this.protoPath = protoPath;
     this.ip = ip;
@@ -43,9 +43,8 @@ class GrpcEmulator {
     this.uiClient = new this.controller.UiController(`127.0.0.1:${eConf['grpc.port']}`, _grpcJs.credentials.createInsecure());
   }
   close() {
-    var _this$screenshotStrea, _this$logcatStream;
-    (_this$screenshotStrea = this.screenshotStream) === null || _this$screenshotStrea === void 0 || _this$screenshotStrea.destroy();
-    (_this$logcatStream = this.logcatStream) === null || _this$logcatStream === void 0 || _this$logcatStream.destroy();
+    this.screenshotStream?.destroy();
+    this.logcatStream?.destroy();
     this.client.getChannel().close();
     this.client.close();
   }
@@ -156,7 +155,8 @@ class GrpcEmulator {
       if (err) console.error(err);
     });
   }
-  showExtendedControls(paneIndex = 0) {
+  showExtendedControls() {
+    let paneIndex = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
     if (!this.uiClient) return Promise.reject('UiController not available');
     return new Promise((resolve, reject) => {
       this.uiClient.showExtendedControls({
@@ -202,7 +202,7 @@ class GrpcEmulator {
     const logMessage = params || {};
     this.logcatStream = this.client.streamLogcat(logMessage, this.authMate);
     this.logcatStream.on('error', err => {
-      console.error('streamLogcat error:', (err === null || err === void 0 ? void 0 : err.message) || err);
+      console.error('streamLogcat error:', err?.message || err);
     });
     return this.logcatStream;
   }

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,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isHeadlessEnvironment = exports.VvdManager = void 0;
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.promise.with-resolvers.js");
+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"));
@@ -65,7 +63,8 @@ exports.isHeadlessEnvironment = isHeadlessEnvironment;
 class VvdManager {
   // 需要复制的文件
   binFiles = ['system.img', 'data.img', 'coredump.core', 'vela_data.bin', 'vela_resource.bin', 'vela_system.bin'];
-  constructor(vvdResourcePaths = {}) {
+  constructor() {
+    let vvdResourcePaths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
       vvdHome,
       sdkHome
@@ -263,7 +262,6 @@ class VvdManager {
     const skinDir = skinPath;
     const layoutPath = _path.default.join(skinDir, 'layout');
     if (_fs.default.existsSync(layoutPath)) {
-      var _skinInfo$parts$defau;
       const layoutContent = _fs.default.readFileSync(layoutPath, 'utf-8');
       const parser = new _skinLayoutParser.ConfigParser();
       const skinInfo = parser.toObject(parser.parse(layoutContent));
@@ -271,7 +269,7 @@ class VvdManager {
       defaultLayout.part1.value = skinInfo.parts[defaultLayout.part1.name];
       defaultLayout.part2.value = skinInfo.parts[defaultLayout.part2.name];
       const backgroundImage = _path.default.join(skinDir, skinInfo.parts[defaultLayout.part1.name].background.image);
-      const maskImage = (_skinInfo$parts$defau = skinInfo.parts[defaultLayout.part1.name]) === null || _skinInfo$parts$defau === void 0 || (_skinInfo$parts$defau = _skinInfo$parts$defau.foreground) === null || _skinInfo$parts$defau === void 0 ? void 0 : _skinInfo$parts$defau.mask;
+      const maskImage = skinInfo.parts[defaultLayout.part1.name]?.foreground?.mask;
       const maskImagePath = maskImage ? _path.default.join(skinDir, maskImage) : undefined;
       return {
         name: skinName,
@@ -367,7 +365,6 @@ class VvdManager {
 
   // 旧的模拟器迁移
   async oldEmulatorMigrate(vvdName) {
-    var _normalizePath, _normalizePath3, _normalizePath4;
     const configIni = _path.default.join(this.getVvdDir(vvdName), 'config.ini');
     const contents = await _promises.default.readFile(configIni, 'utf-8');
     const config = (0, _ini.parse)(contents);
@@ -383,9 +380,8 @@ class VvdManager {
 
     // 检查皮肤路径
     const skinPath = config['skin.path'];
-    if (skinPath && (_normalizePath = normalizePath(skinPath.toString())) !== null && _normalizePath !== void 0 && _normalizePath.includes('.export_dev/skins')) {
-      var _normalizePath2;
-      if ((_normalizePath2 = normalizePath(skinPath.toString())) !== null && _normalizePath2 !== void 0 && _normalizePath2.includes('.export_dev/skins/user')) {
+    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');
@@ -409,7 +405,7 @@ class VvdManager {
     }
 
     // 迁移 原来 user 目录中的 xiaomi_band_10
-    if (skinPath && (_normalizePath3 = normalizePath(skinPath.toString())) !== null && _normalizePath3 !== void 0 && _normalizePath3.endsWith('/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;
@@ -422,7 +418,7 @@ class VvdManager {
     }
 
     // 检查镜像路径
-    if (config['image.sysdir.2'] && (_normalizePath4 = normalizePath(config['image.sysdir.2'].toString())) !== null && _normalizePath4 !== void 0 && _normalizePath4.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'] = normalizePath(config['image.sysdir.2'].toString()).replace('.export_dev/system-images', '.vela/sdk/system-images');
     }
@@ -530,7 +526,7 @@ class VvdManager {
           level: _ILog.Loglevel.INFO,
           message: msg
         });
-        options.customLogger(`${prefix[1]} ${msg === null || msg === void 0 ? void 0 : msg.trim()}`);
+        options.customLogger(`${prefix[1]} ${msg?.trim()}`);
       };
     } else {
       logger = _ColorConsole.default.info;
@@ -566,10 +562,9 @@ class VvdManager {
 
     // 该模拟器已经启动，则创建一个日志流返回
     if (e) {
-      var _e$cmdline;
       // 找出来它原来使用的 debugPort
       const regex = /hostfwd=tcp:(.*?):(\d+)-10\.0\.2\.15:101/;
-      const debugPort = (_e$cmdline = e.cmdline) === null || _e$cmdline === void 0 || (_e$cmdline = _e$cmdline.match(regex)) === null || _e$cmdline === void 0 ? void 0 : _e$cmdline[2];
+      const debugPort = e.cmdline?.match(regex)?.[2];
       const imageType = await getImageType(e['port.serial']);
       const emulatorInstance = (0, _instance.findInstance)(imageType, {
         serialPort: e['port.serial'],
@@ -676,7 +671,8 @@ class VvdManager {
     });
     return promise;
   }
-  stopVvd(name, timeout = 10 * 1000) {
+  stopVvd(name) {
+    let timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10 * 1000;
     return new Promise((resolve, reject) => {
       const config = (0, _emulatorutil.getRunningAvdConfigByName)(name);
       if (!config) {
@@ -691,8 +687,7 @@ class VvdManager {
         clearTimeout(t);
         resolve();
       }).catch(e => {
-        var _e$message;
-        if (e !== null && e !== void 0 && (_e$message = e.message) !== null && _e$message !== void 0 && _e$message.includes(`device 'emulator-${config['port.serial']}' not found`)) {
+        if (e?.message?.includes(`device 'emulator-${config['port.serial']}' not found`)) {
           // 清理之前的文件
           _fs.default.unlinkSync(config.path);
         }

package/lib/vvd/logcat.js

@@ -8,7 +8,11 @@ exports.creatLogcat = creatLogcat;
 var _readline = _interopRequireDefault(require("readline"));
 var _adb = require("@miwt/adb");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function creatLogcat(sn, onStdout = console.log, onErrout = console.log, p, rls) {
+function creatLogcat(sn) {
+  let onStdout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : console.log;
+  let onErrout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : console.log;
+  let p = arguments.length > 3 ? arguments[3] : undefined;
+  let rls = arguments.length > 4 ? arguments[4] : undefined;
   const logcatProcess = p || (0, _adb.spawnAdbCmd)('adb', ['-s', sn, 'logcat']);
   const readlines = rls || attachReadline(logcatProcess, onStdout, onErrout);
   return {
@@ -23,7 +27,7 @@ function attachReadline(p, onStdout, onErrout) {
   let stderrReadline;
 
   // 利用 readline 接口可解决子进程日志换行的问题
-  if (p !== null && p !== void 0 && p.stdout) {
+  if (p?.stdout) {
     stdoutReadline = _readline.default.createInterface({
       input: p.stdout
     });
@@ -31,12 +35,11 @@ function attachReadline(p, onStdout, onErrout) {
       onStdout(str);
     });
     p.stdout.on('close', () => {
-      var _stdoutReadline;
-      (_stdoutReadline = stdoutReadline) === null || _stdoutReadline === void 0 || _stdoutReadline.close();
+      stdoutReadline?.close();
       stdoutReadline = undefined;
     });
   }
-  if (p !== null && p !== void 0 && p.stderr) {
+  if (p?.stderr) {
     stderrReadline = _readline.default.createInterface({
       input: p.stderr
     });
@@ -44,21 +47,19 @@ function attachReadline(p, onStdout, onErrout) {
       onErrout(str);
     });
     p.stderr.on('close', () => {
-      var _stderrReadline;
-      (_stderrReadline = stderrReadline) === null || _stderrReadline === void 0 || _stderrReadline.close();
+      stderrReadline?.close();
     });
   }
   function dispose() {
-    var _stdoutReadline2, _stderrReadline2, _stdoutReadline3, _stderrReadline3;
-    p === null || p === void 0 || p.removeAllListeners();
-    (_stdoutReadline2 = stdoutReadline) === null || _stdoutReadline2 === void 0 || _stdoutReadline2.removeAllListeners();
-    (_stderrReadline2 = stderrReadline) === null || _stderrReadline2 === void 0 || _stderrReadline2.removeAllListeners();
-    (_stdoutReadline3 = stdoutReadline) === null || _stdoutReadline3 === void 0 || _stdoutReadline3.close();
-    (_stderrReadline3 = stderrReadline) === null || _stderrReadline3 === void 0 || _stderrReadline3.close();
+    p?.removeAllListeners();
+    stdoutReadline?.removeAllListeners();
+    stderrReadline?.removeAllListeners();
+    stdoutReadline?.close();
+    stderrReadline?.close();
     stdoutReadline = undefined;
     stderrReadline = undefined;
   }
-  p === null || p === void 0 || p.on('exit', () => {
+  p?.on('exit', () => {
     dispose();
   });
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.6-beta.15",
+  "version": "2.0.6-beta.17",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -32,11 +32,12 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.15",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.17",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
     "@miwt/adb": "0.10.5",
     "adm-zip": "^0.5.16",
+    "core-js": "^3.48.0",
     "dayjs": "^1.11.12",
     "find-process": "^1.4.7",
     "get-port": "^7.1.0",
@@ -49,5 +50,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "8a927aec513af6d004f88e21d85bba0ef2dcac90"
+  "gitHead": "d9d60157e951ebbc58f6a6f6fac63efd9d9d4fd5"
 }