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

package/lib/vvd/logcat.d.ts

@@ -0,0 +1,16 @@
+import readline from 'readline';
+import { ChildProcessWithoutNullStreams } from 'child_process';
+import { EmulatorReadlines } from '../typing/Instance';
+export declare function creatLogcat(sn: string, onStdout?: (msg: string) => void, onErrout?: (msg: string) => void, p?: ChildProcessWithoutNullStreams, rls?: EmulatorReadlines): {
+    logcatProcess: ChildProcessWithoutNullStreams;
+    onStdout: (msg: string) => void;
+    onErrout: (msg: string) => void;
+    stdoutReadline: readline.Interface;
+    stderrReadline: readline.Interface;
+    dispose(): void;
+};
+export declare function attachReadline(p: ChildProcessWithoutNullStreams, onStdout: any, onErrout: any): {
+    stdoutReadline: readline.Interface;
+    stderrReadline: readline.Interface;
+    dispose: () => void;
+};

package/lib/vvd/logcat.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.attachReadline = attachReadline;
+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) {
+  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 {
+    ...readlines,
+    logcatProcess,
+    onStdout,
+    onErrout
+  };
+}
+function attachReadline(p, onStdout, onErrout) {
+  let stdoutReadline;
+  let stderrReadline;
+
+  // 利用 readline 接口可解决子进程日志换行的问题
+  if (p.stdout) {
+    stdoutReadline = _readline.default.createInterface({
+      input: p.stdout
+    });
+    stdoutReadline.on('line', str => {
+      onStdout(str);
+    });
+    p.stdout.on('close', () => {
+      stdoutReadline?.close();
+      stdoutReadline = undefined;
+    });
+  }
+  if (p.stderr) {
+    stderrReadline = _readline.default.createInterface({
+      input: p.stderr
+    });
+    stderrReadline.on('line', str => {
+      onErrout(str);
+    });
+    p.stderr.on('close', () => {
+      stderrReadline?.close();
+    });
+  }
+  function dispose() {
+    stdoutReadline?.close();
+    stderrReadline?.close();
+    stdoutReadline = undefined;
+    stderrReadline = undefined;
+  }
+  p.on('exit', () => {
+    dispose();
+  });
+  return {
+    stdoutReadline,
+    stderrReadline,
+    dispose
+  };
+}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.3-beta.7",
+  "version": "2.0.3-beta.8",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
   "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -35,20 +36,20 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.3-beta.7",
-    "@aiot-toolkit/shared-utils": "2.0.3-beta.7",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.8",
     "@miwt/adb": "^0.9.0",
+    "adm-zip": "^0.5.16",
     "dayjs": "^1.11.12",
     "find-process": "^1.4.7",
-    "fs-extra": "^11.2.0",
+    "get-port": "^7.1.0",
     "ini": "^4.1.3",
+    "ipull": "^3.6.2",
     "portfinder": "^1.0.32",
-    "semver": "^7.6.3",
-    "ws": "^8.18.0"
+    "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
+    "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "9621c52866d7bb1dc23110c4c9cc772b6169b682"
+  "gitHead": "1b1be0a8f4e40978a221fd7dbab4c9a2c168be1e"
 }

package/lib/avd/index.d.ts

@@ -1,28 +0,0 @@
-import { IAvdParams, IAvdResourcePaths } from '../typing/Avd';
-declare class VelaAvdCls {
-    private avdHome;
-    private sdkHome;
-    constructor(avdResourcePaths: IAvdResourcePaths);
-    /**
-     * 创建Vela端的AVD，统一保存在.android目录下
-     * 1. 创建.android/advancedFeatures.ini文件
-     * 2. 创建.android/${avdName}.ini文件
-     * 3. 创建.android/${avdName}.avd/config.ini文件
-     * @param avdParams AVD参数，宽高、绑定的镜像路径等
-     * @returns
-     */
-    createVelaAvd(avdParams: IAvdParams): boolean;
-    /** 根据AVD名字获取模拟器的详细信息 */
-    getVelaAvdInfo(avdName: string): IAvdParams;
-    /** 根据名字删除AVD */
-    deleteVelaAvd(avdName: string): boolean;
-    /** 获取已经创建的模拟器列表 */
-    getVelaAvdList(): IAvdParams[];
-    /** 获取模拟器皮肤列表 */
-    getVelaSkinList(): string[];
-    /** 自定义模拟器的镜像目录 */
-    customImageDir(avdName: string, target: string): void;
-    /** 重置自定义的镜像目录  */
-    resetImageDir(avdName: string): void;
-}
-export default VelaAvdCls;

package/lib/avd/index.js

@@ -1,173 +0,0 @@
-"use strict";
-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 fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const ini_1 = require("ini");
-const constants_1 = require("../emulatorutil/constants");
-const Avd_1 = require("../typing/Avd");
-const EAvdParamsToIni = {
-    arm: {
-        abiType: 'armeabi-v7a'
-    },
-    arm64: {
-        abiType: 'arm64-v8a'
-    }
-};
-class VelaAvdCls {
-    constructor(avdResourcePaths) {
-        const { avdHome, sdkHome } = avdResourcePaths;
-        this.avdHome = avdHome || constants_1.defaultAvdHome;
-        this.sdkHome = sdkHome || constants_1.defaultSDKHome;
-        if (!fs_1.default.existsSync(this.avdHome)) {
-            fs_1.default.mkdirSync(this.avdHome, { recursive: true });
-        }
-    }
-    /**
-     * 创建Vela端的AVD，统一保存在.android目录下
-     * 1. 创建.android/advancedFeatures.ini文件
-     * 2. 创建.android/${avdName}.ini文件
-     * 3. 创建.android/${avdName}.avd/config.ini文件
-     * @param avdParams AVD参数，宽高、绑定的镜像路径等
-     * @returns
-     */
-    createVelaAvd(avdParams) {
-        // 在.android下创建advancedFeatures.ini文件
-        const advancedFeaturesIni = path_1.default.resolve(os_1.default.homedir(), '.android/advancedFeatures.ini');
-        if (!fs_1.default.existsSync(advancedFeaturesIni)) {
-            const iniSourcePath = path_1.default.join(__dirname, '../static/advancedFeatures.ini');
-            fs_1.default.copyFileSync(iniSourcePath, advancedFeaturesIni);
-        }
-        const { avdName, avdArch, avdWidth, avdHeight, avdSkin, avdImagePath = constants_1.defaultImageHome } = avdParams;
-        const avdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
-        const avdIni = path_1.default.resolve(this.avdHome, `${avdName}.ini`);
-        const avdConfigIni = path_1.default.resolve(avdDir, 'config.ini');
-        const nuttxAvdIniContent = `path=${avdDir}\npath.rel=avd${path_1.default.sep}${avdName}.avd`;
-        const abiType = EAvdParamsToIni[avdArch]['abiType'];
-        const configIniJson = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '../static/avdConfigIni.json'), 'utf-8'));
-        configIniJson['AvdId'] = avdName;
-        configIniJson['abi.type'] = abiType;
-        configIniJson['avd.ini.displayname'] = avdName;
-        configIniJson['hw.cpu.arch'] = avdArch;
-        if (avdSkin) {
-            delete configIniJson['hw.lcd.height'];
-            delete configIniJson['hw.lcd.width'];
-            configIniJson['skin.dynamic'] = 'yes';
-            configIniJson['skin.name'] = avdSkin;
-            configIniJson['skin.path'] = path_1.default.resolve(this.sdkHome, 'skins', avdSkin);
-        }
-        else {
-            configIniJson['hw.lcd.height'] = avdHeight;
-            configIniJson['hw.lcd.width'] = avdWidth;
-            configIniJson['skin.dynamic'] = 'no';
-            delete configIniJson['skin.name'];
-            delete configIniJson['skin.path'];
-        }
-        configIniJson['image.sysdir.1'] = avdImagePath;
-        try {
-            fs_1.default.mkdirSync(avdDir, { recursive: true });
-            // 写入Vela_Virtual_Device.ini文件
-            fs_1.default.writeFileSync(avdIni, nuttxAvdIniContent);
-            // 写入Vela_Virtual_Device.avd/config.ini文件
-            fs_1.default.writeFileSync(avdConfigIni, (0, ini_1.stringify)(configIniJson));
-            return true;
-        }
-        catch (e) {
-            throw `createVelaAvd: ${e.message}`;
-        }
-    }
-    /** 根据AVD名字获取模拟器的详细信息 */
-    getVelaAvdInfo(avdName) {
-        const avdInfo = {
-            avdName,
-            avdArch: Avd_1.IAvdArchType.arm,
-            avdHeight: '',
-            avdWidth: '',
-            avdSkin: '',
-            avdImagePath: ''
-        };
-        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
-        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
-        try {
-            const contents = fs_1.default.readFileSync(configIni, 'utf-8');
-            const config = (0, ini_1.parse)(contents);
-            avdInfo.avdArch = config['hw.cpu.arch'];
-            avdInfo.avdHeight = config['hw.lcd.height'];
-            avdInfo.avdWidth = config['hw.lcd.width'];
-            avdInfo.avdSkin = config['skin.name'];
-            avdInfo.avdImagePath = config['image.sysdir.1'];
-            avdInfo.customImagePath = config['image.sysdir.2'];
-            return avdInfo;
-        }
-        catch (err) {
-            ColorConsole_1.default.log(`getVelaAvdInfo: ${err.message}`);
-            return avdInfo;
-        }
-    }
-    /** 根据名字删除AVD */
-    deleteVelaAvd(avdName) {
-        const avdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
-        const avdIni = path_1.default.resolve(this.avdHome, `${avdName}.ini`);
-        try {
-            fs_1.default.rmSync(avdDir, { recursive: true, force: true });
-            fs_1.default.rmSync(avdIni, { force: true });
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    }
-    /** 获取已经创建的模拟器列表 */
-    getVelaAvdList() {
-        const avdList = [];
-        const files = fs_1.default.readdirSync(this.avdHome);
-        const regex = /^(Vela[\d\D]*)\.avd$/;
-        for (const fileName of files) {
-            const matcher = fileName.match(regex);
-            if (matcher) {
-                const avdName = matcher[1];
-                const avdInfo = this.getVelaAvdInfo(avdName);
-                avdList.push(avdInfo);
-            }
-        }
-        return avdList;
-    }
-    /** 获取模拟器皮肤列表 */
-    getVelaSkinList() {
-        try {
-            const skinList = [];
-            const skinHome = path_1.default.resolve(this.sdkHome, 'skins');
-            let files = fs_1.default.readdirSync(skinHome);
-            for (const fileName of files) {
-                !fileName.startsWith('.') && skinList.push(fileName);
-            }
-            return skinList;
-        }
-        catch (e) {
-            return [];
-        }
-    }
-    /** 自定义模拟器的镜像目录 */
-    customImageDir(avdName, target) {
-        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
-        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
-        const contents = fs_1.default.readFileSync(configIni, 'utf-8');
-        const config = (0, ini_1.parse)(contents);
-        config['image.sysdir.2'] = target;
-        fs_1.default.writeFileSync(configIni, (0, ini_1.stringify)(config));
-    }
-    /** 重置自定义的镜像目录  */
-    resetImageDir(avdName) {
-        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
-        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
-        const contents = fs_1.default.readFileSync(configIni, 'utf-8');
-        const config = (0, ini_1.parse)(contents);
-        delete config['image.sysdir.2'];
-        fs_1.default.writeFileSync(configIni, (0, ini_1.stringify)(config));
-    }
-}
-exports.default = VelaAvdCls;

package/lib/emulatorutil/EmulatorCmd.d.ts

@@ -1,9 +0,0 @@
-import { IStartOptions } from '../typing/Instance';
-declare class EmulatorCmd {
-    static startOptions: IStartOptions | undefined;
-    static createMiwerCmd(options: IStartOptions, sdkHome: string, avdHome: string): string | undefined;
-    static createDevCmd(options: IStartOptions, sdkHome: string, avdHome: string): string | undefined;
-    static createPreCmd(options: IStartOptions, sdkHome: string, avdHome: string): string[] | undefined;
-    static getEmulatorBinPath(sdkHome: string): string;
-}
-export default EmulatorCmd;

package/lib/emulatorutil/EmulatorCmd.js

@@ -1,226 +0,0 @@
-"use strict";
-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 fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const avd_1 = __importDefault(require("../avd"));
-const utils_1 = require("../utils");
-const os_1 = __importDefault(require("os"));
-const dayjs_1 = __importDefault(require("dayjs"));
-const constants_1 = require("./constants");
-class EmulatorCmd {
-    static createMiwerCmd(options, sdkHome, avdHome) {
-        var _a;
-        this.startOptions = options;
-        const { avdName, devtool } = options;
-        // 获取emulator bin的绝对路径
-        const emulatorBin = this.getEmulatorBinPath(sdkHome);
-        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
-        // 获取vela镜像的绝对路径
-        const velaAvdCls = new avd_1.default({
-            sdkHome: sdkHome,
-            avdHome: avdHome
-        });
-        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
-        const { avdArch, avdImagePath, customImagePath } = avdInfo;
-        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
-        if (!avdImagePath) {
-            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
-            return undefined;
-        }
-        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
-        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
-        // 端口映射
-        let portMappingStr = ``;
-        if (devtool) {
-            portMappingStr += `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
-        }
-        // 设备挂载节点
-        const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.bin'); // 只读
-        const dataImageBin = path_1.default.resolve(avdImagePath, 'vela_data.bin'); // 可读可写
-        const coreBin = path_1.default.resolve(avdImagePath, 'coredump.core'); // 只读
-        // 复制可写文件到AVD目录下（多模拟器实例时需要）
-        const dataImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'vela_data.bin');
-        if (!fs_extra_1.default.existsSync(dataImageBinInAvd)) {
-            // vela_data.bin不存在时直接copy
-            fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
-        }
-        else {
-            // vela_data.bin存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
-            const statsInAvd = fs_extra_1.default.statSync(dataImageBinInAvd);
-            const stats = fs_extra_1.default.statSync(dataImageBin);
-            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
-                fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
-            }
-        }
-        // 挂载节点配置，只读文件加入read-only标识
-        const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBin},read-only \
--device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
--drive index=1,id=userdata,if=none,format=raw,file=${dataImageBinInAvd} \
--device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
--drive index=2,id=vendor,if=none,format=raw,file=${coreBin},read-only \
--device virtio-blk-device,bus=virtio-mmio-bus.4,drive=vendor \
--device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
-        // grpc配置
-        let windowStr = '';
-        let grpcStr = '';
-        if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.grpcPort) {
-            windowStr = '-qt-hide-window';
-            grpcStr = ` -idle-grpc-timeout 300 -grpc ${this.startOptions.grpcPort}`;
-        }
-        // 启动模拟器的命令和参数
-        const cmd = `${emulatorBin} -nuttx -avd ${avdName} -port ${options.adbPort} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} ${grpcStr} -qemu ${imageMountStr}`;
-        return cmd;
-    }
-    static createDevCmd(options, sdkHome, avdHome) {
-        var _a;
-        this.startOptions = options;
-        const { avdName, devtool } = options;
-        const emulatorBin = this.getEmulatorBinPath(sdkHome);
-        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
-        const velaAvdCls = new avd_1.default({
-            sdkHome: sdkHome,
-            avdHome: avdHome
-        });
-        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
-        const { avdArch, avdImagePath, customImagePath } = avdInfo;
-        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
-        if (!avdImagePath) {
-            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
-            return undefined;
-        }
-        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
-        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
-        // 端口映射
-        let portMappingStr = ``;
-        if (devtool) {
-            portMappingStr += `-network-user-mode-options hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
-        }
-        // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
-        const systemImageBin = path_1.default.join(avdImagePath, 'system.img');
-        const dataImageBin = path_1.default.join(avdImagePath, 'data.img');
-        // 复制可写文件到AVD目录下（多模拟器实例时需要）
-        const dataImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'data.img');
-        if (!fs_extra_1.default.existsSync(dataImageBinInAvd)) {
-            // data.img不存在时直接copy
-            fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
-        }
-        else {
-            // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
-            const statsInAvd = fs_extra_1.default.statSync(dataImageBinInAvd);
-            const stats = fs_extra_1.default.statSync(dataImageBin);
-            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
-                fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
-            }
-        }
-        // 复制可写文件到AVD目录下（多模拟器实例时需要）
-        const systemImageBinInAvd = path_1.default.join(avdHome, `${avdName}.avd`, 'system.img');
-        if (!fs_extra_1.default.existsSync(systemImageBinInAvd)) {
-            // data.img不存在时直接copy
-            fs_extra_1.default.copyFileSync(systemImageBin, systemImageBinInAvd);
-        }
-        else {
-            // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
-            const statsInAvd = fs_extra_1.default.statSync(systemImageBinInAvd);
-            const stats = fs_extra_1.default.statSync(systemImageBin);
-            if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
-                fs_extra_1.default.copyFileSync(systemImageBin, systemImageBinInAvd);
-            }
-        }
-        // 复制可写文件到AVD目录下（多模拟器实例时需要）
-        // const nuttxBinInAvd = path.join(this.avdHome, `${avdName}.avd`, 'nuttx')
-        // if (!fs.existsSync(nuttxBinInAvd)) {
-        //   // data.img不存在时直接copy
-        //   fs.copyFileSync(nuttxBinPath, nuttxBinInAvd)
-        // } else {
-        //   // data.img存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
-        //   const statsInAvd = fs.statSync(nuttxBinInAvd)
-        //   const stats = fs.statSync(nuttxBinPath)
-        //   if (dayjs(stats.mtime).isAfter(statsInAvd.mtime)) {
-        //     fs.copyFileSync(nuttxBinPath, nuttxBinInAvd)
-        //   }
-        // }
-        const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBinInAvd} \
--device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
--drive index=1,id=userdata,if=none,format=raw,file=${dataImageBinInAvd} \
--device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
--device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
-        // grpc配置
-        let windowStr = '';
-        let grpcStr = '';
-        if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.grpcPort) {
-            windowStr = '-qt-hide-window';
-            grpcStr = ` -idle-grpc-timeout 300 -grpc ${this.startOptions.grpcPort}`;
-        }
-        // 启动模拟器的命令和参数
-        const cmd = `${emulatorBin} -nuttx -avd ${avdName} -port ${options.adbPort} -avd-arch ${avdArch} -show-kernel -kernel ${nuttxBinPath} ${portMappingStr} ${windowStr} ${grpcStr} -qemu ${imageMountStr}`;
-        return cmd;
-    }
-    static createPreCmd(options, sdkHome, avdHome) {
-        this.startOptions = options;
-        const { avdName, devtool } = options;
-        // 获取emulator bin的绝对路径
-        const emulatorBin = this.getEmulatorBinPath(sdkHome);
-        ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
-        // 获取vela镜像的绝对路径
-        const velaAvdCls = new avd_1.default({
-            sdkHome: sdkHome,
-            avdHome: avdHome
-        });
-        const avdInfo = velaAvdCls.getVelaAvdInfo(avdName);
-        const { avdArch, avdImagePath, customImagePath } = avdInfo;
-        ColorConsole_1.default.log(`### Emulator ### adb port: ${options.adbPort}`);
-        if (!avdImagePath) {
-            ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
-            return undefined;
-        }
-        const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
-        ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
-        // 端口映射，adb端口和debug端口
-        let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;
-        if (devtool) {
-            ColorConsole_1.default.log(`### Emulator ### debug port: ${options.debugPort}`);
-            portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
-        }
-        ColorConsole_1.default.log(`### Emulator ### Start qemu with TCP: ${portMappingStr}`);
-        // vnc配置
-        let noWindow = false;
-        let vncStr = '';
-        if (options.grpcPort) {
-            noWindow = true;
-            const portSuffix = options.grpcPort - constants_1.defaultVncPort;
-            vncStr = `-vnc :${portSuffix}`;
-        }
-        // 启动goldfish的命令和参数
-        const spawnArgs = [
-            emulatorBin,
-            '-nuttx',
-            '-avd',
-            avdName,
-            '-avd-arch',
-            avdArch,
-            '-show-kernel',
-            '-kernel',
-            nuttxBinPath,
-            noWindow ? '-no-window' : '',
-            '-qemu',
-            vncStr,
-            '-netdev',
-            portMappingStr,
-            '-device',
-            'virtio-net-device,netdev=u1,bus=virtio-mmio-bus.3'
-        ];
-        return spawnArgs;
-    }
-    static getEmulatorBinPath(sdkHome) {
-        const osPlatform = os_1.default.platform();
-        const arch = (0, utils_1.getSystemArch)();
-        const platform = osPlatform === 'win32' ? 'windows' : osPlatform;
-        const emulatorHome = path_1.default.resolve(sdkHome, 'emulator');
-        return path_1.default.resolve(emulatorHome, `${platform}-${arch}`, 'emulator');
-    }
-}
-exports.default = EmulatorCmd;

package/lib/instance/preDev.d.ts

@@ -1,53 +0,0 @@
-import { ChildProcess } from 'child_process';
-import readline from 'readline';
-import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
-import CommonInstance from './common';
-/**
- * OldGoldfishInstance
- * 针对 Vela开发版（dev, 0.0.2）的镜像
- */
-declare class OldGoldfishInstance extends CommonInstance {
-    private host9pPort;
-    v9fsProcess: ChildProcess | undefined;
-    stdoutReadline: readline.Interface;
-    stderrReadline: readline.Interface;
-    constructor(params: INewGoldfishInstanceParams);
-    /**
-     * 1. 启动9p server
-     * 2. 将打包好的rpk推到host的挂载目录
-     * 3. 启动模拟器
-     * 4. 模拟器启动成功后，adb连接模拟器
-     * 5. 连接成功后，在模拟器中启动快应用
-     */
-    start(options: IStartOptions): Promise<void>;
-    /**
-     * 在模拟器中启动快应用（快应用都在模拟器的/data/app目录下）
-     * 1. 是否为调试模式
-     *    若是，在模拟器终端执行vapp app/${packageName} &
-     *    若否，在模拟器终端执行vapp --jsdebugger=10.0.2.15:101 app/${packageName} &
-     */
-    startupQuickApp(options: IStartOptions): void;
-    /** host启动9pServer
-     * 作用是将本地的quickappMountDir目录挂载到模拟器的/data目录
-     */
-    ensure9pServerRunnning(): 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>;
-    /**
-     * 推送文件到本地的${sdkHome}/qa/app/${packageName}目录
-     * @param sourceRoot 源目录
-     */
-    pushRpk(sourceRoot: string): Promise<void>;
-    /** 停止模拟器并释放相关资源 */
-    stop(): Promise<void>;
-}
-export default OldGoldfishInstance;