@aiot-toolkit/emulator 2.0.3 → 2.0.4-beta.1

package/lib/emulatorutil/index.d.ts

@@ -1,4 +1,2 @@
-import EmulatorLog from './EmulatorLog';
 export * from './running';
 export * from './constants';
-export { EmulatorLog };

package/lib/emulatorutil/index.js

@@ -3,20 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  EmulatorLog: true
-};
-Object.defineProperty(exports, "EmulatorLog", {
-  enumerable: true,
-  get: function () {
-    return _EmulatorLog.default;
-  }
-});
-var _EmulatorLog = _interopRequireDefault(require("./EmulatorLog"));
 var _running = require("./running");
 Object.keys(_running).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _running[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -28,7 +17,6 @@ Object.keys(_running).forEach(function (key) {
 var _constants = require("./constants");
 Object.keys(_constants).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _constants[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -36,5 +24,4 @@ Object.keys(_constants).forEach(function (key) {
       return _constants[key];
     }
   });
-});
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+});

package/lib/instance/common.d.ts

@@ -5,7 +5,11 @@ import { ChildProcessWithoutNullStreams } from 'child_process';
 declare class CommonEmulatorInstance {
     imageType: VelaImageType;
     appDir: string;
-    quickappStartedFlag: RegExp;
+    static emulatorStartedFlag: RegExp;
+    static appInstalledFlag: RegExp;
+    static appStartedFlag: RegExp;
+    static isAppInstalled(log: string): boolean;
+    static isEmulatorStarted(log: string): boolean;
     sn: string;
     vvdName: string;
     debugPort?: number | string;
@@ -40,6 +44,7 @@ declare class CommonEmulatorInstance {
     /** 关闭模拟器 */
     poweroff(timeout?: number): Promise<void>;
     systemed(): Promise<string>;
+    getApplist(): Promise<string[]>;
     /** 重启模拟器 */
     reboot(): Promise<void>;
 }

package/lib/instance/common.js

@@ -6,7 +6,8 @@ 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 _adb = _interopRequireWildcard(require("@miwt/adb"));
+var adbMiwt = _adb;
 var _utils = require("../utils");
 var _logcat = require("../vvd/logcat");
 var _emulatorutil = require("../emulatorutil");
@@ -15,7 +16,15 @@ 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';
-  quickappStartedFlag = /Start App loop/;
+  static emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done|booting completed/;
+  static appInstalledFlag = /InstallState_Finished|install finished/;
+  static appStartedFlag = /Start App loop/;
+  static isAppInstalled(log) {
+    return this.appInstalledFlag.test(log);
+  }
+  static isEmulatorStarted(log) {
+    return this.emulatorStartedFlag.test(log);
+  }
   constructor(params) {
     this.sn = `emulator-${params.serialPort}`;
     this.vvdName = params.vvdName;
@@ -140,6 +149,17 @@ class CommonEmulatorInstance {
   systemed() {
     return adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell systemd &`);
   }
+  async getApplist() {
+    const cmd = `adb -s ${this.sn} shell ls ${this.appDir}`;
+    const dataStr = await (0, _adb.execAdbCmdAsync)(cmd);
+    if (dataStr) {
+      // 使用换行符分割字符串，得到数组
+      const appsArray = dataStr.replace(/\r\n/g, '\n').split('\n');
+      const cleanedAppsArray = appsArray.filter(item => item.endsWith('/')).map(item => item.trim().slice(0, -1));
+      return cleanedAppsArray;
+    }
+    return [];
+  }
 
   /** 重启模拟器 */
   async reboot() {

package/lib/instance/dev.d.ts

@@ -2,8 +2,8 @@ import CommonEmulatorInstance from './common';
 import { VelaImageType } from '../typing/Vvd';
 declare class GoldfishInstance extends CommonEmulatorInstance {
     imageType: VelaImageType;
-    appDir: string;
-    emulatorStartedFlag: string;
+    static appDir: string;
+    static emulatorStartedFlag: RegExp;
     install(rpkPath: string, appPackageName?: string): Promise<void>;
     /**
      * 在模拟器中启动快应用

package/lib/instance/dev.js

@@ -12,8 +12,8 @@ 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; }
 class GoldfishInstance extends _common.default {
   imageType = (() => _Vvd.VelaImageType.DEV)();
-  appDir = '/data/app';
-  emulatorStartedFlag = '(NSH)';
+  static appDir = '/data/app';
+  static emulatorStartedFlag = /(NSH)/;
   async install(rpkPath, appPackageName) {
     // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
     rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;

package/lib/instance/index.d.ts

@@ -5,6 +5,7 @@ import PreInstance from './pre';
 import { VelaImageType } from '../typing/Vvd';
 import { IEmulatorInstanceParams } from '../typing/Instance';
 import { VelaPre5Instance } from './pre5';
+declare function getInstanceClass(imageType: VelaImageType): typeof GoldfishInstance | typeof MiwearInstance | typeof PreInstance | typeof VelaPre5Instance;
 /**
  * 根据镜像决定使用哪个instance
  * Vela正式版(4.0) -> MiwearInstance
@@ -12,5 +13,5 @@ import { VelaPre5Instance } from './pre5';
  * Vela开发版（dev, 0.0.2) -> OldGoldfishInstance
  * Vela开发版（dev)，除0.0.2的其他版本 -> GoldfishInstance
  */
-declare function findInstance(imageType: VelaImageType, params: IEmulatorInstanceParams): GoldfishInstance | MiwearInstance;
-export { CommonEmulatorInstance as CommonInstance, GoldfishInstance, MiwearInstance, VelaPre5Instance, PreInstance, findInstance };
+declare function findInstance(imageType: VelaImageType, params: IEmulatorInstanceParams): CommonEmulatorInstance;
+export { CommonEmulatorInstance as CommonInstance, GoldfishInstance, MiwearInstance, VelaPre5Instance, PreInstance, findInstance, getInstanceClass };

package/lib/instance/index.js

@@ -34,6 +34,7 @@ Object.defineProperty(exports, "VelaPre5Instance", {
   }
 });
 exports.findInstance = findInstance;
+exports.getInstanceClass = getInstanceClass;
 var _common = _interopRequireDefault(require("./common"));
 var _dev = _interopRequireDefault(require("./dev"));
 var _miwear = _interopRequireDefault(require("./miwear"));
@@ -41,6 +42,16 @@ var _pre = _interopRequireDefault(require("./pre"));
 var _Vvd = require("../typing/Vvd");
 var _pre2 = require("./pre5");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function getInstanceClass(imageType) {
+  const map = {
+    [_Vvd.VelaImageType.PRE]: _pre.default,
+    [_Vvd.VelaImageType.REL]: _miwear.default,
+    [_Vvd.VelaImageType.DEV]: _dev.default,
+    [_Vvd.VelaImageType.VELA_PRE_5]: _pre2.VelaPre5Instance
+  };
+  return map[imageType] || _dev.default;
+}
+
 /**
  * 根据镜像决定使用哪个instance
  * Vela正式版(4.0) -> MiwearInstance
@@ -49,12 +60,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * Vela开发版（dev)，除0.0.2的其他版本 -> GoldfishInstance
  */
 function findInstance(imageType, params) {
-  const map = {
-    [_Vvd.VelaImageType.PRE]: _pre.default,
-    [_Vvd.VelaImageType.REL]: _miwear.default,
-    [_Vvd.VelaImageType.DEV]: _dev.default,
-    [_Vvd.VelaImageType.VELA_PRE_5]: _pre2.VelaPre5Instance
-  };
-  const Instance = map[imageType] || _dev.default;
+  const Instance = getInstanceClass(imageType);
   return new Instance(params);
 }

package/lib/instance/miwear.d.ts

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

package/lib/instance/miwear.js

@@ -8,7 +8,6 @@ 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); }
@@ -18,6 +17,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * 针对 Vela正式版（4.0）的镜像
  */
 class MiwearInstance extends _common.default {
+  static appInstalledFlag = /InstallState_Finished|install finished/;
   imageType = (() => _Vvd.VelaImageType.REL)();
   appDir = '/data/quickapp/app';
 
@@ -29,7 +29,7 @@ class MiwearInstance extends _common.default {
     adbMiwt.execAdbCmd(`adb -s ${this.sn} shell pm install ${targeRpk}`);
     return new Promise((resolve, reject) => {
       const func = msg => {
-        if (_emulatorutil.EmulatorLog.inStallIsFinshe(msg)) {
+        if (MiwearInstance.isAppInstalled(msg)) {
           clearTimeout(timer);
           this.logger(`Install to ${this.vvdName} ${targeRpk} successfully`);
           resolve();
@@ -68,7 +68,7 @@ class MiwearInstance extends _common.default {
     await super.reboot();
     return new Promise((resolve, reject) => {
       const func = msg => {
-        if (_emulatorutil.EmulatorLog.rpkIsStart(msg)) {
+        if (MiwearInstance.isEmulatorStarted(msg)) {
           clearTimeout(timer);
           resolve();
         }

package/lib/vvd/index.js

@@ -417,7 +417,8 @@ class VvdManager {
     const spawnArgs = cmd.split(' ');
     const spawnBin = spawnArgs.shift();
     logger(`Start CMD: ${cmd}`);
-    const func = vvdInfo.imageType === _Vvd.VelaImageType.REL ? _emulatorutil.EmulatorLog.rpkIsStart : _emulatorutil.EmulatorLog.devIsStart;
+    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',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.3",
+  "version": "2.0.4-beta.1",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,7 +36,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.3",
+    "@aiot-toolkit/shared-utils": "2.0.4-beta.1",
     "@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": "e29e61eb89c2559eb9f3a18c51fd5ce4c4196cc2"
+  "gitHead": "85c4287c7b9468c83d468cfc39b147f4975f8285"
 }

package/lib/emulatorutil/EmulatorLog.d.ts

@@ -1,11 +0,0 @@
-declare class EmulatorLog {
-    static emulatorStartedFlag: RegExp;
-    static installFlag: RegExp;
-    static devStartFlag: string;
-    static preDevStartFlag: RegExp;
-    static inStallIsFinshe(msg: string): RegExpMatchArray | null;
-    static rpkIsStart(msg: string): RegExpMatchArray | null;
-    static devIsStart(msg: string): boolean;
-    static preDevIsStart(msg: string): RegExpMatchArray | null;
-}
-export default EmulatorLog;

package/lib/emulatorutil/EmulatorLog.js

@@ -1,25 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-class EmulatorLog {
-  static emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
-  static installFlag = /InstallState_Finished|install finished/;
-  static devStartFlag = '(NSH)';
-  static preDevStartFlag = /Server started, listening on: 127.0.0.1:(\d+)/;
-  static inStallIsFinshe(msg) {
-    return msg.match(EmulatorLog.installFlag);
-  }
-  static rpkIsStart(msg) {
-    return msg.match(EmulatorLog.emulatorStartedFlag);
-  }
-  static devIsStart(msg) {
-    return msg.includes(EmulatorLog.devStartFlag);
-  }
-  static preDevIsStart(msg) {
-    return msg.match(EmulatorLog.preDevStartFlag);
-  }
-}
-var _default = exports.default = EmulatorLog;