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

package/lib/utils/index.js

@@ -1,144 +1,130 @@
 "use strict";
-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 });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.delayRun = delayRun;
+exports.getEvenPort = getEvenPort;
 exports.getSystemArch = getSystemArch;
-exports.killProcessByPid = killProcessByPid;
 exports.killProcessByCmd = killProcessByCmd;
+exports.killProcessByPid = killProcessByPid;
 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"));
+var _ColorConsole = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+var _child_process = require("child_process");
+var _findProcess = _interopRequireDefault(require("find-process"));
+var _os = _interopRequireDefault(require("os"));
+var _semver = _interopRequireDefault(require("semver"));
+var _portfinder = _interopRequireDefault(require("portfinder"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const cpuArch = {
-    arm64: 'aarch64',
-    aarch64: 'aarch64',
-    x64: 'x86_64',
-    x86_64: 'x86_64'
+  arm64: 'aarch64',
+  aarch64: 'aarch64',
+  x64: 'x86_64',
+  x86_64: 'x86_64'
 };
+
 /** 获取mac电脑的CPU架构
  * node 15.0.0之后，m1芯片的mac的os.arch()才是arm64，在这之前都是x86
  * 所以15.0.0之前无法通过os.arch()区分，也无法通过execSync('uname -m')区分
  */
 function getSystemArch() {
-    const platform = os_1.default.platform();
-    let osArch = os_1.default.arch();
-    const nodeVersion = process.version;
-    if (semver_1.default.lt(nodeVersion, '15.0.0') && platform === 'darwin') {
-        try {
-            (0, child_process_1.execSync)('sysctl -n sysctl.proc_translated');
-            osArch = 'arm64';
-        }
-        catch (_a) {
-            osArch = 'x64';
-        }
-    }
-    if (osArch !== 'arm64' && osArch !== 'x64') {
-        return ColorConsole_1.default.throw(`unsupport system`);
+  const platform = _os.default.platform();
+  let osArch = _os.default.arch();
+  const nodeVersion = process.version;
+  if (_semver.default.lt(nodeVersion, '15.0.0') && platform === 'darwin') {
+    try {
+      (0, _child_process.execSync)('sysctl -n sysctl.proc_translated');
+      osArch = 'arm64';
+    } catch {
+      osArch = 'x64';
     }
-    return cpuArch[osArch];
+  }
+  if (osArch !== 'arm64' && osArch !== 'x64') {
+    return _ColorConsole.default.throw(`unsupport system`);
+  }
+  return cpuArch[osArch];
 }
+
 /** 根据PID杀死进程 */
 function killProcessByPid(pid) {
-    try {
-        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}`);
-    }
+  try {
+    const cmd = _os.default.platform() === 'win32' ? `taskkill /pid ${pid} /T /F` : `kill -9 ${pid}`;
+    (0, _child_process.execSync)(cmd);
+  } catch (e) {
+    console.error(`kill process ${pid} get error: ${e}`);
+  }
 }
+
 /**
  * 根据命令杀死进程
  */
-function killProcessByCmd(cmd) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!cmd)
-            return;
-        try {
-            const list = yield (0, find_process_1.default)('name', cmd);
-            list.forEach((item) => __awaiter(this, void 0, void 0, function* () {
-                killProcessByPid(item.pid.toString());
-            }));
-        }
-        catch (e) {
-            console.error(`kill process ${cmd} get error: ${e}`);
-        }
+async function killProcessByCmd(cmd) {
+  if (!cmd) return;
+  try {
+    const list = await (0, _findProcess.default)('name', cmd);
+    list.forEach(async item => {
+      killProcessByPid(item.pid.toString());
     });
+  } catch (e) {
+    console.error(`kill process ${cmd} get error: ${e}`);
+  }
 }
+
 /** 延迟函数 */
-function sleep(time) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve) => setTimeout(resolve, time));
-    });
+async function sleep(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)));
-    });
+async function tryRun(task) {
+  let maxCount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5;
+  let duration = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000;
+  let currentCount = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  if (currentCount > maxCount) return false;
+  return Boolean(await task()) || (await 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);
-        });
-    });
+async function delayRun(task) {
+  let duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1000;
+  return new Promise(resolve => {
+    setTimeout(async () => {
+      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;
+async function getEvenPort() {
+  const startPort = 5556;
+  const stopPort = 5584;
+  let index = 1;
+  let port = await _portfinder.default.getPortPromise({
+    port: startPort,
+    stopPort
+  });
+  while (port % 2 !== 0) {
+    if (index > 13) return false;
+    port = await _portfinder.default.getPortPromise({
+      port: startPort + 2,
+      stopPort
     });
-}
+    index++;
+  }
+  return port;
+}

package/lib/vvd/index.d.ts

@@ -0,0 +1,107 @@
+import { IVvdParams, IVvdResourcePaths, SDKChildren, SDKDownloadOpt, SkinInfo, VelaImageType } from '../typing/Vvd';
+import { IStartOptions, IStartWithSerialPort } from '../typing/Instance';
+import { findInstance } from '../instance';
+import type { DownloadFileOptions } from 'ipull';
+export declare class VvdManager {
+    private vvdHome;
+    private sdkHome;
+    constructor(vvdResourcePaths: IVvdResourcePaths);
+    /**
+     * 创建Vela端的 VVD ，统一保存在 .vela/vvd 目录下
+     * 1. 创建.vela/advancedFeatures.ini文件
+     * 2. 创建.vela/vvd/${avdName}.ini文件
+     * 3. 创建.vela/vvd/${avdName}.vvd/config.ini文件
+     * @param vvdParams VVD参数，宽高、绑定的镜像路径等
+     * @returns
+     */
+    createVvd(vvdParams: IVvdParams): boolean;
+    getVvdDir(vvdName: string): string;
+    /** 根据AVD名字获取模拟器的详细信息 */
+    getVvdInfo(vvdName: string): IVvdParams;
+    /** 根据名字删除AVD */
+    deleteVvd(vvdName: string): boolean;
+    /** 获取已经创建的模拟器列表 */
+    getVvdList(): IVvdParams[];
+    /** 获取 SDK 子目录 */
+    getSDKChild(name: SDKChildren): string;
+    getSkinInfo(skinName: string, skinPath: string): {
+        name: string;
+        path: string;
+        info: SkinInfo;
+        backgroundImage: string;
+        maskImage: string | undefined;
+        defaultLayout: import("../typing/Vvd").EmulatorLayout;
+    } | undefined;
+    /** 获取模拟器皮肤列表 */
+    getVelaSkinList(): Promise<{
+        name: string;
+        path: string;
+        info: SkinInfo;
+        backgroundImage: string;
+        maskImage: string | undefined;
+        defaultLayout: import("../typing/Vvd").EmulatorLayout;
+    }[]>;
+    /** 自定义模拟器的镜像目录 */
+    customImageDir(vvdName: string, target: string): void;
+    /** 重置自定义的镜像目录  */
+    resetImageDir(vvdName: string): void;
+    getEmulatorBinPath(sdkHome: string): string;
+    getVvdStartCmd(options: IStartOptions | IStartWithSerialPort): Promise<string>;
+    startVvd(options: IStartOptions | IStartWithSerialPort): Promise<{
+        coldBoot: boolean;
+        emulatorInstance: ReturnType<typeof findInstance>;
+    }>;
+    stopVvd(name: string, timeout?: number): Promise<void>;
+    /** 获取模拟器平台的名称，darwin-aarch64 linux-aarch64 windows-x86_64等 */
+    getEmulatorPlatform(): string;
+    /** 获取本地镜像的构建时间 */
+    getLocalImageBuildTime(imagePath: string): Promise<Date | undefined>;
+    getSDKVersionPath(): string;
+    /** 获取本地 SDK 的版本信息 */
+    getSDKVersion(): Promise<Record<SDKChildren, string>>;
+    /** 获取本地已经下载的镜像 */
+    getLocalSystemImage(): Promise<{
+        value: string;
+        time: Date | undefined;
+    }[]>;
+    getLocalSystemPath(imageId: VelaImageType): string;
+    hasLocaleImage(imageId: VelaImageType): boolean;
+    /** 判断本地的某个 vela 镜像是否需要更新 */
+    isLocalImageNeedUpdate(imageId: VelaImageType): Promise<boolean>;
+    getNotInstalledSDKPart(): Promise<SDKChildren[]>;
+    /** 检查 SDK 有哪些部分需要更新 */
+    hasSDKChildrenUpdate(): Promise<SDKChildren[]>;
+    /**
+     * 下载 SDK，默认只下载需要更新的部分
+     * @param opt.force 强制下载所有部分
+     *
+     * @example
+     * async function main() {
+     * const sdkHome = path.resolve(os.homedir(), '.export_dev1')
+     * const velaAvdCls = new VelaAvdCls({ sdkHome })
+     *
+     * const downloder = await velaAvdCls.downloadSDK({
+     *  force: true,
+     *   cliProgress: false,
+     *   parallelDownloads: 6
+     * })
+     *
+     * downloder.on('progress', (progress) => {
+     *  console.log(
+     *    `progress: ${progress.formattedSpeed} ${progress.formattedPercentage} ${progress.formatTotal} ${progress.formatTimeLeft}`
+     *  )
+     * })
+     *
+     * await downloder.downlodPromise
+     *
+     * console.log('download success')
+     * }
+     */
+    downloadSDK(opt: SDKDownloadOpt): Promise<import("ipull").DownloadEngineMultiDownload<import("ipull").BaseDownloadEngine> & {
+        downlodPromise: Promise<void>;
+    }>;
+    /** 下载vela系统镜像 */
+    downloadImage(imageId: VelaImageType, opt?: Partial<DownloadFileOptions>): Promise<import("ipull").DownloadEngineNodejs<import("ipull/dist/download/download-engine/streams/download-engine-write-stream/download-engine-write-stream-nodejs").default> & {
+        downlodPromise: Promise<void>;
+    }>;
+}