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

package/lib/instance/pre.js

@@ -1,100 +1,62 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const dev_1 = __importDefault(require("./dev"));
-const miwear_1 = __importDefault(require("./miwear"));
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const adbMiwt = __importStar(require("@miwt/adb"));
+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); }
+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 }; }
 /**
  * 不带 miwear 的 4.0 镜像
  */
-class PreInstance extends dev_1.default {
-    constructor() {
-        super(...arguments);
-        this.appDir = '/data/quickapp/app';
-    }
-    pushRpk(rpkPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { package: appPackageName } = this.projectInfo;
-            const releaseDir = this.isRpk
-                ? path_1.default.resolve(this.projectPath, '../')
-                : path_1.default.resolve(this.projectPath, 'dist');
-            let srouceRpk = rpkPath;
-            if (!srouceRpk) {
-                const files = fs_1.default
-                    .readdirSync(releaseDir)
-                    .filter((item) => item.includes(appPackageName) && item.endsWith('.rpk'));
-                if (files.length === 0) {
-                    ColorConsole_1.default.error(`### Emulator the rpk does not exist`);
-                }
-                srouceRpk = path_1.default.resolve(releaseDir, files[0]);
-            }
-            // 1. adb push应用的rpk
-            const targetPath = `${this.appDir}/${appPackageName}.rpk`;
-            const pushCmd = `adb -s ${this.sn} push "${srouceRpk}" ${targetPath}`;
-            ColorConsole_1.default.info(`### Emulator ### Excuting cmd: ${pushCmd}`);
-            yield adbMiwt.execAdbCmdAsync(pushCmd);
-            ColorConsole_1.default.info(`### Emulator push to ${this.appDir}/${appPackageName} successfully`);
-            return targetPath;
-        });
-    }
-    installApp(rpkPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { package: appPackageName } = this.projectInfo;
-            // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
-            rpkPath = rpkPath || `${this.appDir}/${appPackageName}.rpk`;
-            const targetPath = `${this.appDir}/${appPackageName}`;
-            const mkdirCmd = `adb -s ${this.sn} shell mkdir ${targetPath}`;
-            ColorConsole_1.default.info(`### Emulator mkdir cmd ${mkdirCmd}`);
-            yield adbMiwt.execAdbCmdAsync(mkdirCmd);
-            const unzipCmd = `adb -s ${this.sn} shell unzip -o ${rpkPath} -d ${targetPath}`;
-            ColorConsole_1.default.info(`### Emulator unzip cmd ${unzipCmd}`);
-            yield adbMiwt.execAdbCmdAsync(unzipCmd);
-        });
-    }
-    pushAndInstall(rpkPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const target = yield this.pushRpk(rpkPath);
-            yield this.installApp(target);
-        });
+class PreInstance extends _dev.default {
+  imageType = (() => _Vvd.VelaImageType.PRE)();
+  appDir = '/data/quickapp/app';
+  async install(rpkPath, appPackageName) {
+    // 基于 vapp 启动的应用只需要将 rpk 解压到指定的目录下
+    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}`);
+    await adbMiwt.execAdbCmdAsync(mkdirCmd);
+    const unzipCmd = `adb -s ${this.sn} shell unzip -o ${rpkPath} -d ${targetPath}`;
+    _ColorConsole.default.info(`### Emulator unzip cmd ${unzipCmd}`);
+    await adbMiwt.execAdbCmdAsync(unzipCmd);
+  }
+
+  /**
+   * 在模拟器中启动快应用
+   * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
+   * @param options
+   */
+  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) {
+        vappCmd = `adb -s ${this.sn} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
+      }
+      _ColorConsole.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
+      adbMiwt.execAdbCmd(vappCmd, {
+        stdio: 'ignore',
+        encoding: 'utf-8'
+      });
+    } catch (e) {
+      _ColorConsole.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
     }
+  }
+  async closeApp(_appName) {
+    await this.reboot();
+  }
+  async reloadApp(appName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    await this.reboot();
+    this.startApp(appName, debug);
+  }
 }
-//  pre 镜像的 启动 方式与 MiwearInstance 一致
-PreInstance.prototype.startGoldfish = miwear_1.default.prototype.startGoldfish;
-exports.default = PreInstance;
+var _default = exports.default = PreInstance;

package/lib/instance/pre5.d.ts

@@ -0,0 +1,11 @@
+import { VelaImageType } from '../typing/Vvd';
+import MiwearInstance from './miwear';
+export declare class VelaPre5Instance extends MiwearInstance {
+    imageType: VelaImageType;
+    appDir: string;
+    /**
+     * 使用 pm 安装快应用
+     * @param targeRpk 快应用的rpk文件路径
+     */
+    install(targeRpk: string): Promise<void>;
+}

package/lib/instance/pre5.js

@@ -0,0 +1,38 @@
+"use strict";
+
+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"));
+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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+class VelaPre5Instance extends _miwear.default {
+  imageType = (() => _Vvd.VelaImageType.VELA_PRE_5)();
+  appDir = '/data/app';
+
+  /**
+   * 使用 pm 安装快应用
+   * @param targeRpk 快应用的rpk文件路径
+   */
+  async install(targeRpk) {
+    const installCmd = `adb -s ${this.sn} shell pm install ${targeRpk}`;
+    _ColorConsole.default.info(`### Emulator ### Excuting cmd: ${installCmd}`);
+    const res = await adbMiwt.execAdbCmdAsync(installCmd);
+    await (0, _util.promisify)(process.nextTick)();
+    _ColorConsole.default.info(`### Emulator ### 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);
+    }
+  }
+}
+exports.VelaPre5Instance = VelaPre5Instance;

package/lib/static/avdConfigIni.json

@@ -6,7 +6,7 @@
   "fastboot.forceChosenSnapshotBoot": "no",
   "fastboot.forceColdBoot": "yes",
   "fastboot.forceFastBoot": "no",
-  "hw.accelerometer": "no",
+  "hw.accelerometer": "yes",
   "hw.arc": false,
   "hw.audioInput": "yes",
   "hw.battery": "yes",
@@ -17,19 +17,19 @@
   "hw.dPad": "no",
   "hw.gps": "yes",
   "hw.gpu.enabled": "no",
-  "hw.gpu.mode": "off",
+  "hw.gpu.mode": "host",
   "hw.initialOrientation": "Portrait",
   "hw.keyboard": "yes",
   "hw.lcd.density": 420,
-  "hw.lcd.height": 480,
-  "hw.lcd.width": 480,
+  "hw.lcd.height": 466,
+  "hw.lcd.width": 466,
   "hw.mainKeys": "no",
   "hw.ramSize": 512,
   "hw.sdCard": "no",
   "hw.sensors.orientation": "yes",
   "hw.sensors.proximity": "yes",
   "hw.trackBall": "no",
-  "image.sysdir.1": "",
+  "image.sysdir.2": "",
   "runtime.network.latency": "none",
   "runtime.network.speed": "full",
   "showDeviceFrame": "yes",

package/lib/typing/Instance.d.ts

@@ -1,27 +1,42 @@
-import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
-import { IAvdResourcePaths } from './Avd';
-export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
-    projectPath: string;
-    sourceRoot?: string;
-    compilerOption?: Partial<IJavascriptCompileOption>;
+import readline from 'readline';
+import { ChildProcessWithoutNullStreams } from 'child_process';
+export interface EmulatorReadlines {
+    stdoutReadline: readline.Interface;
+    stderrReadline: readline.Interface;
+    dispose(): void;
+}
+export interface IEmulatorInstanceParams extends Partial<EmulatorReadlines> {
+    serialPort: string;
+    debugPort?: number | string;
+    vvdName: string;
+    onStdout?: (msg: string) => void;
+    onErrout?: (msg: string) => void;
+    /** 模拟器日志输出进程 */
+    logcatProcess?: ChildProcessWithoutNullStreams;
 }
 export interface IStartOptions {
-    avdName: string;
+    vvdName: string;
+    isRpk?: boolean;
     devtool?: string;
     /** @deprecated */
     disableNSH?: boolean;
     origin?: IStartOrigin;
-    serverPort?: number;
+    sdkHome?: string;
     grpcPort?: number;
-    adbPort: number;
+    qtHideWindow?: boolean;
+    verbose?: boolean;
     debugPort?: number;
-    stdoutCallback?: (buffer: Buffer) => void;
-    stderrCallback?: (buffer: Buffer) => void;
+    stdoutCallback?: (buffer: string) => void;
+    stderrCallback?: (buffer: string) => void;
     exitCallback?: (code: number | null) => void;
-    /** 要推送的目录路径 */
-    dist?: string;
-    /** 要推送到的目的路径 */
-    tar?: string;
+}
+/**
+ * 如果指定了 serialPort 则必须同时指定 grpcPort
+ * 否则
+ */
+export interface IStartWithSerialPort extends IStartOptions {
+    serialPort: number;
+    grpcPort: number;
 }
 export declare enum IStartOrigin {
     Terminal = "terminal",

package/lib/typing/Instance.js

@@ -1,8 +1,15 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.IStartOrigin = void 0;
-var IStartOrigin;
-(function (IStartOrigin) {
-    IStartOrigin["Terminal"] = "terminal";
-    IStartOrigin["Ide"] = "ide";
-})(IStartOrigin || (exports.IStartOrigin = IStartOrigin = {}));
+/**
+ * 如果指定了 serialPort 则必须同时指定 grpcPort
+ * 否则
+ */
+let IStartOrigin = exports.IStartOrigin = /*#__PURE__*/function (IStartOrigin) {
+  IStartOrigin["Terminal"] = "terminal";
+  IStartOrigin["Ide"] = "ide";
+  return IStartOrigin;
+}({});

package/lib/typing/Vvd.d.ts

@@ -0,0 +1,105 @@
+export interface IVvdResourcePaths {
+    vvdHome?: string;
+    sdkHome?: string;
+    imageHome?: string;
+}
+export declare enum IVvdArchType {
+    arm = "arm",
+    arm64 = "arm64"
+}
+export declare enum VelaImageType {
+    VELA_PRE_5 = "vela-pre-5.0",
+    REL = "vela-release-4.0",
+    PRE = "vela-pre-4.0",
+    DEV = "vela-dev-0.0.4"
+}
+export interface IVvdParams {
+    name: string;
+    arch: IVvdArchType;
+    width: string;
+    height: string;
+    skin?: string;
+    'skin.path'?: string;
+    imageDir?: string;
+    customImagePath?: string;
+    shape?: string;
+    flavor?: string;
+    density?: string;
+    customLcdRadius?: string;
+    imageType: VelaImageType;
+    skinInfo?: EmulatorSkin;
+}
+export interface EmulatorPart {
+    display: {
+        width: string;
+        height: string;
+        x: string;
+        y: string;
+        shape?: string;
+        flavor?: string;
+        density?: string;
+        [i: string]: any;
+    };
+    background: {
+        mask?: string;
+        image: string;
+        [i: string]: any;
+    };
+    foreground: {
+        image?: string;
+        mask?: string;
+        [i: string]: any;
+    };
+}
+export interface EmulatorLayout {
+    width: string;
+    height: string;
+    part1: {
+        x: string;
+        y: string;
+        name: string;
+        value: EmulatorPart;
+    };
+    part2: {
+        x: string;
+        y: string;
+        name: string;
+        value: EmulatorPart;
+    };
+    [i: string]: any;
+}
+export interface SkinInfo {
+    parts: Record<string, EmulatorPart>;
+    layouts: {
+        portrait?: EmulatorLayout;
+        landscape?: EmulatorLayout;
+    };
+    props: {
+        default?: 'yes' | 'no';
+        shape?: string;
+        flavor?: string;
+        density?: string;
+    };
+}
+export interface EmulatorSkin {
+    name: string;
+    info: SkinInfo;
+    backgroundImage: string;
+    maskImage: string | undefined;
+    defaultLayout: EmulatorLayout;
+}
+export declare enum SDKChildren {
+    EMULATOR = "emulator",
+    QA = "qa",
+    SKINS = "skins",
+    SYSTEM_IMAGES = "system-images",
+    MODEM_SIMULATOR = "modem_simulator"
+}
+export declare enum VELAHOME {
+    SDK = ".export",
+    VVD = ".vela/vvd"
+}
+export type SDKDownloadOpt = {
+    force?: boolean;
+    parallelStreams?: number;
+} & Parameters<typeof import('ipull').downloadSequence>[0];

package/lib/typing/Vvd.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.VelaImageType = exports.VELAHOME = exports.SDKChildren = 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["VELA_PRE_5"] = "vela-pre-5.0";
+  VelaImageType["REL"] = "vela-release-4.0";
+  VelaImageType["PRE"] = "vela-pre-4.0";
+  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 VELAHOME = exports.VELAHOME = /*#__PURE__*/function (VELAHOME) {
+  VELAHOME["SDK"] = ".export";
+  VELAHOME["VVD"] = ".vela/vvd";
+  return VELAHOME;
+}({});

package/lib/utils/file.js

@@ -0,0 +1 @@
+"use strict";