@aiot-toolkit/emulator 2.0.2-dev.8 → 2.0.3-beta.1

package/lib/instance/preDev.d.ts

@@ -1,21 +1,51 @@
-/// <reference types="node" />
 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);
-    /** 在goldfish模拟器中运行快应用 */
+    /**
+     * 1. 启动9p server
+     * 2. 将打包好的rpk推到host的挂载目录
+     * 3. 启动模拟器
+     * 4. 模拟器启动成功后，adb连接模拟器
+     * 5. 连接成功后，在模拟器中启动快应用
+     */
     start(options: IStartOptions): Promise<void>;
-    /** 在goldfish中启动快应用 */
+    /**
+     * 在模拟器中启动快应用（快应用都在模拟器的/data/app目录下）
+     * 1. 是否为调试模式
+     *    若是，在模拟器终端执行vapp app/${packageName} &
+     *    若否，在模拟器终端执行vapp --jsdebugger=10.0.2.15:101 app/${packageName} &
+     */
     startupQuickApp(options: IStartOptions): void;
-    /** host启动9pServer */
+    /** host启动9pServer
+     * 作用是将本地的quickappMountDir目录挂载到模拟器的/data目录
+     */
     ensure9pServerRunnning(): Promise<void>;
-    /** 启动goldfish模拟器 */
+    /**
+     * 启动模拟器
+     * 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>;
-    /** 通过adb连接模拟器 */
-    connectGoldfish(): Promise<boolean>;
+    /**
+     * 推送文件到本地的${sdkHome}/qa/app/${packageName}目录
+     * @param sourceRoot 源目录
+     */
     pushRpk(sourceRoot: string): Promise<void>;
     /** 停止模拟器并释放相关资源 */
     stop(): Promise<void>;

package/lib/instance/preDev.js

@@ -44,27 +44,44 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const portfinder_1 = __importDefault(require("portfinder"));
-const constants_1 = require("../static/constants");
+const readline_1 = __importDefault(require("readline"));
+const Instance_1 = require("../typing/Instance");
+const emulatorutil_1 = require("../emulatorutil");
 const common_1 = __importDefault(require("./common"));
+/**
+ * OldGoldfishInstance
+ * 针对 Vela开发版（dev, 0.0.2）的镜像
+ */
 class OldGoldfishInstance extends common_1.default {
     constructor(params) {
         super(params);
         this.host9pPort = 7878;
     }
-    /** 在goldfish模拟器中运行快应用 */
+    /**
+     * 1. 启动9p server
+     * 2. 将打包好的rpk推到host的挂载目录
+     * 3. 启动模拟器
+     * 4. 模拟器启动成功后，adb连接模拟器
+     * 5. 连接成功后，在模拟器中启动快应用
+     */
     start(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.startOptions = options;
+            this.sn = `127.0.0.1:${this.startOptions.adbPort}`;
             // host启动9p server
             yield this.ensure9pServerRunnning();
-            this.startOptions = options;
             // 将rpk推到host的./export/qa/app目录
-            const buildedFilesPath = this.isRpk ? this.projectPath : path_1.default.resolve(this.projectPath, './build');
+            const buildedFilesPath = this.isRpk
+                ? this.projectPath
+                : path_1.default.resolve(this.projectPath, './build');
             this.pushRpk(buildedFilesPath);
             // 启动模拟器
             yield this.startGoldfish(options);
+            // adb连接快应用
             const connected = yield this.connectGoldfish();
             if (connected) {
                 ColorConsole_1.default.log('### Emulator ### Goldfish emulator connected successfully');
+                // 如果是首次启动，创建server端监听事件
                 if (this.isFirstStart && this.startOptions.serverPort) {
                     yield this.createWebsockeServer();
                 }
@@ -77,17 +94,23 @@ class OldGoldfishInstance extends common_1.default {
             }
         });
     }
-    /** 在goldfish中启动快应用 */
+    /**
+     * 在模拟器中启动快应用（快应用都在模拟器的/data/app目录下）
+     * 1. 是否为调试模式
+     *    若是，在模拟器终端执行vapp app/${packageName} &
+     *    若否，在模拟器终端执行vapp --jsdebugger=10.0.2.15:101 app/${packageName} &
+     */
     startupQuickApp(options) {
         try {
             const { package: packageName } = this.projectInfo;
             const appMountDir = path_1.default.resolve(this.sdkHome, 'qa');
-            const mountCmd = `adb -s 127.0.0.1:${this.adbPort} shell mount -t v9fs -o tag=10.0.2.2,port=${this.host9pPort},aname=${appMountDir} /data`;
+            const mountCmd = `adb -s 127.0.0.1:${options.adbPort} shell mount -t v9fs -o tag=10.0.2.2,port=${this.host9pPort},aname=${appMountDir} /data`;
             ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${mountCmd}`);
             adbMiwt.execAdbCmdSync(mountCmd);
-            let vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp app/${packageName} &`;
+            let vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp app/${packageName} &`;
+            // 调试情况下，需要加--jsdebugger=10.0.2.15:101
             if (options.devtool) {
-                vappCmd = `adb -s 127.0.0.1:${this.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
+                vappCmd = `adb -s 127.0.0.1:${options.adbPort} shell vapp --jsdebugger=10.0.2.15:101 app/${packageName} &`;
             }
             ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${vappCmd}`);
             // vapp进程会一直pending，不会退出。这里必须加stdio: 'ignore'，否则快应用无法运行成功
@@ -97,7 +120,9 @@ class OldGoldfishInstance extends common_1.default {
             ColorConsole_1.default.error(`### Emulator ### Failed to startup quickapp: ${e.message}`);
         }
     }
-    /** host启动9pServer */
+    /** host启动9pServer
+     * 作用是将本地的quickappMountDir目录挂载到模拟器的/data目录
+     */
     ensure9pServerRunnning() {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -121,133 +146,82 @@ class OldGoldfishInstance extends common_1.default {
                 address,
                 '--debug'
             ]);
+            // 监听stderr，判断9p server是否启动成功了
             (_a = this.v9fsProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                 const output = data.toString();
-                if (output.match(/Server started, listening on: 127.0.0.1:(\d+)/)) {
-                    ColorConsole_1.default.log(output);
+                if (emulatorutil_1.EmulatorLog.preDevIsStart(output)) {
                     ColorConsole_1.default.log('### Emulator ### 9p server starts successfully');
                     return resolve();
                 }
             });
+            // 监听exit事件，判断9p server是否退出了
             this.v9fsProcess.on('exit', (code) => {
                 ColorConsole_1.default.error(`### Emulator ### ya-vm-file-server exited with code ${code}`);
                 return reject();
             });
         }));
     }
-    /** 启动goldfish模拟器 */
+    /**
+     * 启动模拟器
+     * 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) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { avdName, devtool } = options;
-            const emulatorBin = this.getEmulatorBinPath();
-            ColorConsole_1.default.log(`### Emulator ### emulator path: ${emulatorBin}`);
-            const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath } = avdInfo;
-            this.adbPort = yield portfinder_1.default.getPortPromise({ port: this.adbPort });
-            ColorConsole_1.default.log(`### Emulator ### adb port: ${this.adbPort}`);
-            if (!avdImagePath) {
-                return ColorConsole_1.default.throw(`### Emulator ### Unable to find vela image via avd`);
-            }
-            const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
-            ColorConsole_1.default.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
-            let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
-            if (devtool) {
-                this.debugPort = yield portfinder_1.default.getPortPromise({ port: this.debugPort });
-                ColorConsole_1.default.log(`### Emulator ### debug port: ${this.debugPort}`);
-                portMappingStr += `,hostfwd=tcp:127.0.0.1:${this.debugPort}-10.0.2.15:101`;
-            }
-            ColorConsole_1.default.log(`### Emulator ### Start qemu with TCP: ${portMappingStr}`);
-            const stdioType = options.disableNSH ? 'pipe' : 'inherit';
-            // vnc配置
-            let noWindow = false;
-            let vncStr = '';
-            if (options.vncPort) {
-                noWindow = true;
-                const portSuffix = options.vncPort - constants_1.defaultVncPort;
-                vncStr = `-vnc :${portSuffix}`;
-            }
+            const { origin = Instance_1.IStartOrigin.Terminal } = options;
             // 启动goldfish的命令和参数
-            const spawnBin = emulatorBin;
-            const spawnArgs = [
-                '-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'
-            ];
-            ColorConsole_1.default.log(`### Emulator ### Start CMD: ${spawnBin} ${spawnArgs.join(' ')}`);
+            const spawnArgs = emulatorutil_1.EmulatorCmd.createPreCmd(options, this.sdkHome, this.avdHome);
+            const spawnBin = spawnArgs && spawnArgs.shift();
+            if (!spawnArgs || !spawnBin)
+                return;
+            ColorConsole_1.default.log(`### Emulator ### Start CMD preDev: ${spawnBin} ${spawnArgs.join(' ')}`);
             return new Promise((resolve) => {
-                var _a;
-                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: stdioType, shell: true });
+                var _a, _b, _c;
+                this.goldfishProcess = (0, child_process_1.spawn)(spawnBin, spawnArgs, { stdio: 'pipe', shell: true });
+                // 监听错误流
                 (_a = this.goldfishProcess.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                     const stderrCb = options.stderrCallback || console.log;
                     stderrCb(data.toString());
                 });
+                if (origin === Instance_1.IStartOrigin.Terminal) {
+                    process.stdout.pipe(this.goldfishProcess.stdin);
+                }
+                // 利用 readline 接口可解决子进程日志换行的问题
+                this.stdoutReadline = readline_1.default.createInterface({
+                    input: this.goldfishProcess.stdout
+                });
+                this.stderrReadline = readline_1.default.createInterface({
+                    input: this.goldfishProcess.stderr
+                });
+                // 监听模拟器的退出事件
                 this.goldfishProcess.on('exit', (code) => {
                     ColorConsole_1.default.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
                     if (options.exitCallback) {
                         options.exitCallback(code);
                     }
                 });
-                const p1 = new Promise((resolve) => {
-                    var _a, _b;
-                    (_b = (_a = this.goldfishProcess) === null || _a === void 0 ? void 0 : _a.stdout) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                        const stdoutCb = options.stdoutCallback || console.log;
-                        stdoutCb(data.toString());
-                        if (data.toString().includes('(NSH)')) {
-                            ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
-                            resolve();
-                        }
-                    });
+                // 监听输出流。输出了'(NSH)'标识后则认为模拟器启动成功
+                (_c = (_b = this.goldfishProcess) === null || _b === void 0 ? void 0 : _b.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (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();
+                    }
                 });
-                const p2 = setTimeout(() => {
-                    ColorConsole_1.default.log(`### Emulator ### Goldfish emulator starts successfully`);
-                    resolve();
-                }, 2000);
-                return Promise.race([p1, p2]);
             });
         });
     }
-    /** 通过adb连接模拟器 */
-    connectGoldfish() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let adbConnected = false;
-            const connectFn = () => __awaiter(this, void 0, void 0, function* () {
-                const sn = `127.0.0.1:${this.adbPort}`;
-                while (!adbConnected) {
-                    const adbKillCmd = `adb kill-server`;
-                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbKillCmd}`);
-                    adbMiwt.execAdbCmdSync(adbKillCmd);
-                    const adbConnectCmd = `adb connect ${sn}`;
-                    ColorConsole_1.default.log(`### Emulator ### Excuting adb cmd: ${adbConnectCmd}`);
-                    const str = adbMiwt.execAdbCmdSync(adbConnectCmd);
-                    ColorConsole_1.default.log(`### Emulator ### ${str}`);
-                    const devices = yield adbMiwt.getAdbDevices();
-                    ColorConsole_1.default.log(`### Emulator ### adb devices: ${JSON.stringify(devices)}`);
-                    adbConnected =
-                        devices.filter((item) => item.sn === sn && item.status === 'device').length > 0;
-                }
-                Promise.resolve(adbConnected);
-            });
-            yield Promise.race([
-                connectFn(),
-                new Promise((resolve) => {
-                    setTimeout(() => resolve(false), 600 * 1000);
-                })
-            ]);
-            return adbConnected;
-        });
-    }
+    /**
+     * 推送文件到本地的${sdkHome}/qa/app/${packageName}目录
+     * @param sourceRoot 源目录
+     */
     pushRpk(sourceRoot) {
         return __awaiter(this, void 0, void 0, function* () {
             const { package: appPackageName } = this.projectInfo;

package/lib/static/advancedFeatures.ini

@@ -0,0 +1 @@
+ModemSimulator = on

package/lib/static/avdConfigIni.json

@@ -10,14 +10,14 @@
   "hw.arc": false,
   "hw.audioInput": "yes",
   "hw.battery": "yes",
-  "hw.camera.back": "virtualscene",
-  "hw.camera.front": "emulated",
+  "hw.camera.back": "None",
+  "hw.camera.front": "None",
   "hw.cpu.arch": "arm",
   "hw.cpu.ncore": 4,
   "hw.dPad": "no",
   "hw.gps": "yes",
   "hw.gpu.enabled": "no",
-  "hw.gpu.mode ": "off",
+  "hw.gpu.mode": "off",
   "hw.initialOrientation": "Portrait",
   "hw.keyboard": "yes",
   "hw.lcd.density": 420,
@@ -36,4 +36,4 @@
   "skin.dynamic": "no",
   "skin.name": "",
   "skin.path": ""
-}
+}

package/lib/typing/Avd.d.ts

@@ -14,6 +14,7 @@ export interface IAvdParams {
     avdHeight: string;
     avdSkin?: string;
     avdImagePath?: string;
+    customImagePath?: string;
 }
 export interface ISkinInfo {
     skinName: string;

package/lib/typing/Instance.d.ts

@@ -1,16 +1,29 @@
-/// <reference types="node" />
-import { IAvdResourcePaths } from "./Avd";
+import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
+import { IAvdResourcePaths } from './Avd';
 export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
     projectPath: string;
     sourceRoot?: string;
+    compilerOption?: Partial<IJavascriptCompileOption>;
 }
 export interface IStartOptions {
     avdName: string;
     devtool?: string;
+    /** @deprecated */
     disableNSH?: boolean;
+    origin?: IStartOrigin;
     serverPort?: number;
-    vncPort?: number;
+    grpcPort?: number;
+    adbPort: number;
+    debugPort?: number;
     stdoutCallback?: (buffer: Buffer) => void;
     stderrCallback?: (buffer: Buffer) => void;
     exitCallback?: (code: number | null) => void;
+    /** 要推送的目录路径 */
+    dist?: string;
+    /** 要推送到的目的路径 */
+    tar?: string;
+}
+export declare enum IStartOrigin {
+    Terminal = "terminal",
+    Ide = "ide"
 }

package/lib/typing/Instance.js

@@ -1,2 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IStartOrigin = void 0;
+var IStartOrigin;
+(function (IStartOrigin) {
+    IStartOrigin["Terminal"] = "terminal";
+    IStartOrigin["Ide"] = "ide";
+})(IStartOrigin || (exports.IStartOrigin = IStartOrigin = {}));

package/lib/utils/index.d.ts

@@ -9,4 +9,25 @@ export declare function killProcessByPid(pid: string): void;
  * 根据命令杀死进程
  */
 export declare function killProcessByCmd(cmd: string): Promise<void>;
+/** 延迟函数 */
 export declare function sleep(time: number): Promise<void>;
+/**
+ * 重复执行某个任务直到成功，或者超过最大次数
+ * @param task 任务，需要返回 bool 值表示是否执行成功
+ * @param {Number=} maxCount 最大重试次数
+ * @param {number=} duration 每次重试的间隔
+ */
+export declare function tryRun(task: (...args: any[]) => Promise<any>, maxCount?: number, duration?: number, currentCount?: number): Promise<boolean>;
+/**
+ * 延迟执行某个任务
+ * @param task
+ * @param duration
+ * @returns
+ */
+export declare function delayRun<T = any>(task: (...args: any[]) => Promise<T> | T, duration?: number): Promise<T>;
+/**
+ * 为avdPort寻找一个不被占用的端口
+ * 端口号必须是偶数且在5555和5585之间
+ * @returns {number}
+ */
+export declare function getEvenPort(): Promise<number | false>;

package/lib/utils/index.js

@@ -12,17 +12,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = exports.killProcessByCmd = exports.killProcessByPid = exports.getSystemArch = void 0;
+exports.getSystemArch = getSystemArch;
+exports.killProcessByPid = killProcessByPid;
+exports.killProcessByCmd = killProcessByCmd;
+exports.sleep = sleep;
+exports.tryRun = tryRun;
+exports.delayRun = delayRun;
+exports.getEvenPort = getEvenPort;
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const child_process_1 = require("child_process");
 const find_process_1 = __importDefault(require("find-process"));
 const os_1 = __importDefault(require("os"));
 const semver_1 = __importDefault(require("semver"));
+const portfinder_1 = __importDefault(require("portfinder"));
 const cpuArch = {
     arm64: 'aarch64',
     aarch64: 'aarch64',
     x64: 'x86_64',
-    x86_64: 'x86_64',
+    x86_64: 'x86_64'
 };
 /** 获取mac电脑的CPU架构
  * node 15.0.0之后，m1芯片的mac的os.arch()才是arm64，在这之前都是x86
@@ -46,20 +53,16 @@ function getSystemArch() {
     }
     return cpuArch[osArch];
 }
-exports.getSystemArch = getSystemArch;
 /** 根据PID杀死进程 */
 function killProcessByPid(pid) {
     try {
-        const cmd = os_1.default.platform() === "win32"
-            ? `taskkill /pid ${pid} /T /F`
-            : `kill -9 ${pid}`;
+        const cmd = os_1.default.platform() === 'win32' ? `taskkill /pid ${pid} /T /F` : `kill -9 ${pid}`;
         (0, child_process_1.execSync)(cmd);
     }
     catch (e) {
         console.error(`kill process ${pid} get error: ${e}`);
     }
 }
-exports.killProcessByPid = killProcessByPid;
 /**
  * 根据命令杀死进程
  */
@@ -78,10 +81,64 @@ function killProcessByCmd(cmd) {
         }
     });
 }
-exports.killProcessByCmd = killProcessByCmd;
+/** 延迟函数 */
 function sleep(time) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise(resolve => setTimeout(resolve, time));
+        return new Promise((resolve) => setTimeout(resolve, time));
+    });
+}
+/**
+ * 重复执行某个任务直到成功，或者超过最大次数
+ * @param task 任务，需要返回 bool 值表示是否执行成功
+ * @param {Number=} maxCount 最大重试次数
+ * @param {number=} duration 每次重试的间隔
+ */
+function tryRun(task_1) {
+    return __awaiter(this, arguments, void 0, function* (task, maxCount = 5, duration = 1000, currentCount = 0) {
+        if (currentCount > maxCount)
+            return false;
+        return (Boolean(yield task()) ||
+            (yield delayRun(() => tryRun(task, maxCount, duration, currentCount + 1), duration)));
+    });
+}
+/**
+ * 延迟执行某个任务
+ * @param task
+ * @param duration
+ * @returns
+ */
+function delayRun(task_1) {
+    return __awaiter(this, arguments, void 0, function* (task, duration = 1000) {
+        return new Promise((resolve) => {
+            setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                return resolve(task());
+            }), duration);
+        });
+    });
+}
+/**
+ * 为avdPort寻找一个不被占用的端口
+ * 端口号必须是偶数且在5555和5585之间
+ * @returns {number}
+ */
+function getEvenPort() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const startPort = 5556;
+        const stopPort = 5584;
+        let index = 1;
+        let port = yield portfinder_1.default.getPortPromise({
+            port: startPort,
+            stopPort
+        });
+        while (port % 2 !== 0) {
+            if (index > 13)
+                return false;
+            port = yield portfinder_1.default.getPortPromise({
+                port: startPort + 2,
+                stopPort
+            });
+            index++;
+        }
+        return port;
     });
 }
-exports.sleep = sleep;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-dev.8",
+  "version": "2.0.3-beta.1",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,10 +35,20 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-dev.8",
-    "@aiot-toolkit/shared-utils": "2.0.2-dev.8",
+    "@aiot-toolkit/aiotpack": "2.0.3-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.1",
+    "@miwt/adb": "^0.9.0",
+    "dayjs": "^1.11.12",
     "find-process": "^1.4.7",
-    "portfinder": "^1.0.32"
+    "fs-extra": "^11.2.0",
+    "ini": "^4.1.3",
+    "portfinder": "^1.0.32",
+    "semver": "^7.6.3",
+    "ws": "^8.18.0"
   },
-  "gitHead": "831575362ba47778c9441f95cec41ddded36cffc"
+  "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
+    "@types/ini": "^4.1.1"
+  },
+  "gitHead": "77b1b0aab9b5c227b5cc355b585a7c93761cc9a3"
 }

package/lib/static/constants.d.ts

@@ -1,19 +0,0 @@
-export declare const defaultSDKHome: string;
-export declare const defaultAvdHome: string;
-export declare const defaultImageHome: string;
-export declare const defaultEmulatorHome: string;
-export declare const defaultSkinHome: string;
-export declare const defaultQuickappHome: string;
-export declare const defaultToolsHome: string;
-export declare const defaultVncPort = 5900;
-export declare const emulatorEnvVersion: {
-    name: string;
-    emulator: string;
-    qa: string;
-    skins: string;
-    'system-images': {
-        release: string;
-        dev: string;
-    };
-    tools: string;
-};

package/lib/static/constants.js

@@ -1,27 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.emulatorEnvVersion = exports.defaultVncPort = exports.defaultToolsHome = exports.defaultQuickappHome = exports.defaultSkinHome = exports.defaultEmulatorHome = exports.defaultImageHome = exports.defaultAvdHome = exports.defaultSDKHome = void 0;
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-exports.defaultSDKHome = path_1.default.resolve(os_1.default.homedir(), '.export');
-exports.defaultAvdHome = path_1.default.resolve(os_1.default.homedir(), '.android', 'avd');
-exports.defaultImageHome = path_1.default.resolve(exports.defaultSDKHome, 'system-images/arm');
-exports.defaultEmulatorHome = path_1.default.resolve(exports.defaultSDKHome, 'emulator');
-exports.defaultSkinHome = path_1.default.resolve(exports.defaultSDKHome, 'skins');
-exports.defaultQuickappHome = path_1.default.resolve(exports.defaultSDKHome, 'qa');
-exports.defaultToolsHome = path_1.default.resolve(exports.defaultSDKHome, 'tools');
-exports.defaultVncPort = 5900;
-exports.emulatorEnvVersion = {
-    name: '模拟器资源版本管理',
-    emulator: '0.0.1',
-    qa: '0.0.1',
-    skins: '0.0.1',
-    'system-images': {
-        release: '4.0',
-        dev: '0.0.2'
-    },
-    tools: '0.0.2'
-};