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

package/lib/instance/dev.js

@@ -1,238 +1,57 @@
 "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 ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const adbMiwt = __importStar(require("@miwt/adb"));
-const child_process_1 = require("child_process");
-const readline_1 = __importDefault(require("readline"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const Instance_1 = require("../typing/Instance");
-const common_1 = __importDefault(require("./common"));
-const emulatorutil_1 = require("../emulatorutil");
-class GoldfishInstance extends common_1.default {
-    constructor(params) {
-        super(params);
-        this.appDir = '/data/app';
-        this.emulatorStartedFlag = '(NSH)';
-    }
-    /**
-     * 1. 启动模拟器
-     * 2. 启动成功后，adb连接模拟器
-     * 3. 连接成功后，在模拟器中启动快应用
-     */
-    start(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.startOptions = options;
-            this.sn = `emulator-${this.startOptions.adbPort}`;
-            // 启动模拟器
-            yield this.startGoldfish(options);
-            const connected = yield this.isConnected();
-            if (connected) {
-                ColorConsole_1.default.log('### Emulator ### Goldfish emulator connected successfully');
-                if (this.isFirstStart && this.startOptions.serverPort) {
-                    yield this.createWebsockeServer();
-                }
-                yield this.pushAndInstall();
-                // 在模拟器中启动快应用
-                this.startupQuickApp(options);
-                this.isFirstStart = false;
-            }
-            else {
-                const msg = '### Emulator ### Failed to connect emulator, please check whether the adb is normal';
-                ColorConsole_1.default.throw(msg);
-                throw new Error(msg);
-            }
-        });
-    }
-    /**
-     * 在模拟器中启动快应用
-     * 通过vapp命令启动，调试时需额外配置--jsdebugger参数
-     * @param options
-     */
-    startupQuickApp(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const { package: packageName } = this.projectInfo;
-                let vappCmd = `adb -s ${this.sn} shell vapp app/${packageName} &`;
-                if (options.devtool) {
-                    vappCmd = `adb -s ${this.sn} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
-                }
-                ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
-                // vapp进程会一直pending，不会退出。这里必须加stdio: 'ignore'，否则快应用无法运行成功
-                adbMiwt.execAdbCmdAsync(vappCmd, { stdio: 'ignore', encoding: 'utf-8' });
-            }
-            catch (e) {
-                ColorConsole_1.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
-            }
-        });
-    }
-    /**
-     * 启动模拟器
-     * 1. 通过options生成模拟器的启动命令
-     * 2. 执行启动命令
-     * 3. 判断模拟器是否启动成功
-     *    3.1 若disableNSH=true，输出流中匹配到(NSH)，认为模拟器启动成功了
-     *    3.2 若disableNSH=false，认为2s过后模拟器启动成功了
-     * @param options
-     * @returns
-     */
-    startGoldfish(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { origin = Instance_1.IStartOrigin.Terminal } = options;
-            // 启动模拟器的命令和参数
-            const cmd = emulatorutil_1.EmulatorCmd.createDevCmd(options, this.sdkHome, this.avdHome);
-            if (!cmd)
-                return;
-            const spawnArgs = cmd.split(' ');
-            const spawnBin = spawnArgs.shift();
-            ColorConsole_1.default.log(`### Emulator ### Start CMD dev: ${cmd}`);
-            return new Promise((resolve) => {
-                var _a, _b;
-                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: 'pipe', shell: true });
-                // 利用 readline 接口可解决子进程日志换行的问题
-                this.stdoutReadline = readline_1.default.createInterface({
-                    input: this.goldfishProcess.stdout
-                });
-                this.stderrReadline = readline_1.default.createInterface({
-                    input: this.goldfishProcess.stderr
-                });
-                (_a = this.stderrReadline) === null || _a === void 0 ? void 0 : _a.on('line', (data) => {
-                    const stderrCb = options.stderrCallback || console.log;
-                    stderrCb(data.toString());
-                });
-                if (origin === Instance_1.IStartOrigin.Terminal) {
-                    process.stdin.pipe(this.goldfishProcess.stdin);
-                }
-                this.goldfishProcess.on('exit', (code) => {
-                    ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
-                    if (options.exitCallback) {
-                        options.exitCallback(code);
-                    }
-                });
-                (_b = this.stdoutReadline) === null || _b === void 0 ? void 0 : _b.on('line', (data) => {
-                    const msg = data.toString();
-                    const stdoutCb = options.stdoutCallback || console.log;
-                    stdoutCb(msg);
-                    if (emulatorutil_1.EmulatorLog.devIsStart(msg)) {
-                        ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
-                        resolve();
-                    }
-                });
-            });
-        });
-    }
-    /**
-     * 将目录通过adb push到模拟器中
-     */
-    pushAndInstall(rpkPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sn = this.sn;
-            const { package: appPackageName } = this.projectInfo;
-            const sourceRoot = rpkPath || this.isRpk ? this.projectPath : path_1.default.join(this.projectPath, './build');
-            // 获取最后一层目录，比如build
-            const basename = path_1.default.basename(sourceRoot);
-            if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
-                // windows系统或者项目路径有空格：1. adb push目录；2. 在模拟器中使用mv命令重命名
-                // 注意 sourceRoot 中可能会有空格
-                const pushCmd = `adb -s ${sn} push "${sourceRoot}" ${this.appDir}`;
-                ColorConsole_1.default.info(`### Emulator ### push CMD: ${pushCmd}`);
-                yield adbMiwt.execAdbCmdAsync(pushCmd);
-                // 在 windows 上 mv 命令不能更新原有的文件,需要先删除
-                const rmCmd = `adb -s ${sn} shell rm -r ${this.appDir}/${appPackageName}`;
-                ColorConsole_1.default.info(`### Emulator ### mv CMD: ${rmCmd}`);
-                yield adbMiwt.execAdbCmdAsync(rmCmd);
-                const mvCmd = `adb -s ${sn} shell  mv ${this.appDir}/${basename} ${this.appDir}/${appPackageName}`;
-                ColorConsole_1.default.info(`### Emulator ### mv CMD: ${mvCmd}`);
-                yield adbMiwt.execAdbCmdAsync(mvCmd);
-            }
-            else {
-                // 支持通配符处理: 1. 模拟器中mkdir创建目录 2. adb push ./XXXXX/* /XXX
-                const sourcePath = path_1.default.join(sourceRoot, './*');
-                const mkdirCmd = `adb -s ${sn} shell mkdir ${this.appDir}/${appPackageName}`;
-                ColorConsole_1.default.log(`### Emulator ### mkdir CMD: ${mkdirCmd}`);
-                yield adbMiwt.execAdbCmdAsync(mkdirCmd);
-                const pushCmd = `adb -s ${sn} push ${sourcePath} ${this.appDir}/${appPackageName}`;
-                ColorConsole_1.default.log(`### Emulator ### pushCmd CMD: ${pushCmd}`);
-                yield adbMiwt.execAdbCmdAsync(pushCmd);
-            }
-            ColorConsole_1.default.info(`### Emulator push to ${this.appDir}/${appPackageName} successfully`);
-        });
-    }
-    /** 通过命令行启动时，在watich模式下监听websocket消息，
-     * 在文件发生变动时，重新启动应用
-     */
-    restart() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.pushAndReloadApp();
-        });
-    }
-    /**
-     * 重新推送，然后重启应用
-     */
-    pushAndReloadApp() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.pushAndInstall();
-                yield this.reboot();
-                this.reloadApp();
-            }
-            catch (e) {
-                ColorConsole_1.default.error(`${e}`);
-            }
-        });
-    }
-    /**
-     * 重启应用
-     */
-    reloadApp() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { package: appPackageName } = this.projectInfo;
-            this.startupQuickApp(this.startOptions);
-            ColorConsole_1.default.info(`### Emulator start ${appPackageName} successfully`);
-        });
-    }
-    reboot() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const rebootCmd = `adb -s ${this.sn} shell reboot`;
-            ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${rebootCmd}`);
-            yield adbMiwt.execAdbCmdAsync(rebootCmd);
-            return this.isConnected();
-        });
-    }
+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 _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';
+  emulatorStartedFlag = '(NSH)';
+  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 reloadApp(appName) {
+    let debug = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    await this.reboot();
+    await this.startApp(appName, debug);
+  }
 }
-exports.default = GoldfishInstance;
+var _default = exports.default = GoldfishInstance;

package/lib/instance/index.d.ts

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

package/lib/instance/index.js

@@ -1,22 +1,46 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PreInstance = exports.OldGoldfishInstance = exports.MiwearInstance = exports.GoldfishInstance = exports.CommonInstance = void 0;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "CommonInstance", {
+  enumerable: true,
+  get: function () {
+    return _common.default;
+  }
+});
+Object.defineProperty(exports, "GoldfishInstance", {
+  enumerable: true,
+  get: function () {
+    return _dev.default;
+  }
+});
+Object.defineProperty(exports, "MiwearInstance", {
+  enumerable: true,
+  get: function () {
+    return _miwear.default;
+  }
+});
+Object.defineProperty(exports, "PreInstance", {
+  enumerable: true,
+  get: function () {
+    return _pre.default;
+  }
+});
+Object.defineProperty(exports, "VelaPre5Instance", {
+  enumerable: true,
+  get: function () {
+    return _pre2.VelaPre5Instance;
+  }
+});
 exports.findInstance = findInstance;
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const avd_1 = __importDefault(require("../avd"));
-const common_1 = __importDefault(require("./common"));
-exports.CommonInstance = common_1.default;
-const dev_1 = __importDefault(require("./dev"));
-exports.GoldfishInstance = dev_1.default;
-const miwear_1 = __importDefault(require("./miwear"));
-exports.MiwearInstance = miwear_1.default;
-const preDev_1 = __importDefault(require("./preDev"));
-exports.OldGoldfishInstance = preDev_1.default;
-const pre_1 = __importDefault(require("./pre"));
-exports.PreInstance = pre_1.default;
+var _common = _interopRequireDefault(require("./common"));
+var _dev = _interopRequireDefault(require("./dev"));
+var _miwear = _interopRequireDefault(require("./miwear"));
+var _pre = _interopRequireDefault(require("./pre"));
+var _Vvd = require("../typing/Vvd");
+var _pre2 = require("./pre5");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * 根据镜像决定使用哪个instance
  * Vela正式版(4.0) -> MiwearInstance
@@ -24,21 +48,13 @@ exports.PreInstance = pre_1.default;
  * Vela开发版（dev, 0.0.2) -> OldGoldfishInstance
  * Vela开发版（dev)，除0.0.2的其他版本 -> GoldfishInstance
  */
-function findInstance(avdName, params) {
-    const { sdkHome, avdHome } = params;
-    const { avdImagePath } = new avd_1.default({ sdkHome, avdHome }).getVelaAvdInfo(avdName);
-    if (!avdImagePath) {
-        ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
-        return;
-    }
-    if (avdImagePath.includes('vela-pre-4.0')) {
-        return new pre_1.default(params);
-    }
-    if (avdImagePath.includes('release')) {
-        return new miwear_1.default(params);
-    }
-    else if (avdImagePath.match(/0\.0\.2|0\.0\.1/)) {
-        return new preDev_1.default(params);
-    }
-    return new dev_1.default(params);
-}
+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;
+  return new Instance(params);
+}

package/lib/instance/miwear.d.ts

@@ -1,82 +1,21 @@
-import readline from 'readline';
-import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
-import CommonInstance from './common';
+import CommonEmulatorInstance from './common';
+import { VelaImageType } from '../typing/Vvd';
 /**
  * MiwearInstance
  * 针对 Vela正式版（4.0）的镜像
  */
-declare class MiwearInstance extends CommonInstance {
-    private params;
-    private appDir;
-    private debugSocket?;
-    private reconnectCount;
-    stdoutReadline: readline.Interface;
-    stderrReadline: readline.Interface;
-    constructor(params: INewGoldfishInstanceParams);
+declare class MiwearInstance extends CommonEmulatorInstance {
+    imageType: VelaImageType;
+    appDir: string;
     /**
-     * 1. 启动模拟器
-     * 2. 启动成功后，adb连接模拟器
-     * 3. 连接成功后，在模拟器中启动快应用
-     */
-    start(options: IStartOptions): Promise<void>;
-    /**
-     * 启动模拟器
-     * 1. 通过options生成模拟器的启动命令
-     * 2. 执行启动命令
-     * 3. 判断模拟器是否启动成功
-     *    3.1 若disableNSH=true，输出流中匹配到/quickapp_rpk_installer_init|rpk installer init done/，认为模拟器启动成功了
-     *    3.2 若disableNSH=false，认为8s过后模拟器启动成功了
-     * @param options
-     * @returns
-     */
-    startGoldfish(options: IStartOptions): Promise<void>;
-    /**
-     * 在模拟器中启动快应用
-     * 1. 检查release目录是否有打包好的rpk
-     * 2. 检查当前是否为调试模式.
-     *    若是，将debugger_ip.cfg推到模拟器的/data/目录下
-     *    若否，则要删除模拟器中已有的data/debugger_ip.cfg
-     * 3. 调用installRpkToAppList将当前快应用安装到模拟器的应用列表中
-     * @param options
-     */
-    startupQuickApp(options: IStartOptions): Promise<void>;
-    /**
-     * 将快应用安装到模拟器的应用列表
-     * 1. 使用adb push将打包好的rpk推到模拟器的/data/quickapp/app/
-     * 2. nsh中调用pm install命令安装应用
-     * @param rpkPath rpk的绝对目录
-     * @param targetDir 要将rpk放到模拟器的哪个目录下
-     */
-    pushAndInstall(rpkPath: string, targetDir: string): Promise<void>;
-    /** 使用am start启动快应用 */
-    launchQuickapp(): Promise<void>;
-    /** 连接模拟器中的调试服务，创建debugSocket
-     * 主要用于热更新时，通过debugSocket通知调试服务更新页面
-     * 设置了重连机制，会重复连接8次
-     */
-    initDebugSocket(): Promise<void>;
-    /** 通知模拟器更新
-     * 1. 确保已经成功连接模拟器中的调试服务
-     * 2. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
-     * 3. 发送Page.reload命令给调试服务，通知更新
-     */
-    handleUpdate(): Promise<void>;
-    /** 热更新时push目录 */
-    pushBuild(): Promise<void>;
-    /** 通过命令行启动时，在watich模式下监听websocket消息，
-     * 在文件发生变动时，重新启动应用
-     */
-    restart(): Promise<void>;
-    /** 在模拟器中重启快应用（基于am命令，需要保证镜像中已经有am功能）
-     * 1. 使用adb push将build文件下的内容推到/data/quickapp/app/${packageName}
-     * 2. nsh中执行am stop命令退出快应用
-     * 3. nsh中执行am start命令启动快应用
-     */
-    pushAndReloadApp(): Promise<void>;
-    reloadApp(): Promise<void>;
-    /**
-     * 创建server端，监听打包过程中client端发来的消息
-     */
-    createWebsockeServer(): Promise<void>;
+     * 使用 pm 安装快应用
+     * @param targeRpk 快应用的rpk文件路径
+     */
+    install(targeRpk: string): Promise<void>;
+    /** 使用 am start 启动快应用 */
+    startApp(packageName: string, debug?: boolean): Promise<void>;
+    closeApp(appName: string): Promise<void>;
+    reboot(): Promise<void>;
+    reloadApp(appPackageName: string, _debug?: boolean): Promise<void>;
 }
 export default MiwearInstance;