@aiot-toolkit/emulator 2.0.4-beta.1 → 2.0.4-beta.2

package/lib/emulatorutil/constants.d.ts

@@ -42,3 +42,4 @@ export declare function getImageDownloadUrl(): Record<VelaImageType, string>;
  */
 export declare function getSDKPartDownloadUrl(type: SDKParts): string;
 export declare function getDefaultImage(): VelaImageType;
+export declare function isVelaImageType(value: any): value is VelaImageType;

package/lib/emulatorutil/constants.js

@@ -7,6 +7,7 @@ exports.emulatorBaseUrl = exports.defaultVvdHome = exports.defaultVncPort = expo
 exports.getDefaultImage = getDefaultImage;
 exports.getImageDownloadUrl = getImageDownloadUrl;
 exports.getSDKPartDownloadUrl = getSDKPartDownloadUrl;
+exports.isVelaImageType = isVelaImageType;
 exports.versionUrl = exports.systemImageBaseUrl = void 0;
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
@@ -101,4 +102,7 @@ function getSDKPartDownloadUrl(type) {
 }
 function getDefaultImage() {
   return _Vvd.VelaImageType.REL;
+}
+function isVelaImageType(value) {
+  return Object.values(_Vvd.VelaImageType).includes(value);
 }

package/lib/instance/common.js

@@ -95,7 +95,7 @@ class CommonEmulatorInstance {
   async isConnected() {
     return (0, _utils.tryRun)(async () => {
       const devices = await adbMiwt.getAdbDevices();
-      _ColorConsole.default.log(`adb devices: ${JSON.stringify(devices)}`);
+      this.logger(`adb devices: ${JSON.stringify(devices)}`);
       const curDev = devices.find(t => t.sn === this.sn);
       return curDev?.status === 'device';
     }, 10, 500);
@@ -164,10 +164,10 @@ class CommonEmulatorInstance {
   /** 重启模拟器 */
   async reboot() {
     const rebootCmd = `adb -s ${this.sn} shell reboot`;
-    _ColorConsole.default.log(`Excuting: ${rebootCmd}`);
+    this.logger(`Excuting: ${rebootCmd}`);
     await adbMiwt.execAdbCmdAsync(rebootCmd);
     await this.isConnected();
-    if (!this.logcatProcess.exitCode !== undefined) {
+    if (this.logcatProcess.exitCode !== null) {
       // 如果 logcat 进程被杀死，则重新创建
       const r = (0, _logcat.creatLogcat)(this.sn, this.onStdout, this.onErrout);
       this.logcatProcess = r.logcatProcess;

package/lib/typing/Vvd.d.ts

@@ -81,6 +81,10 @@ export interface SkinInfo {
         density?: string;
     };
 }
+export interface DownloadItem {
+    name: string;
+    url: string;
+}
 export interface EmulatorSkin {
     name: string;
     info: SkinInfo;
@@ -102,4 +106,5 @@ export declare enum VELAHOME {
 export type SDKDownloadOpt = {
     force?: boolean;
     parallelStreams?: number;
+    imageTypeArr?: VelaImageType[];
 } & Parameters<typeof import('ipull').downloadSequence>[0];

package/lib/vvd/index.js

@@ -643,10 +643,27 @@ class VvdManager {
    */
   async downloadSDK(opt) {
     const updateList = opt.force ? Object.values(_Vvd.SDKParts) : await this.hasSDKPartUpdate();
-    const urls = updateList.map(t => ({
+    let urls = updateList.map(t => ({
       name: t,
       url: (0, _constants.getSDKPartDownloadUrl)(t)
     }));
+    if (opt.imageTypeArr) {
+      // 首先过滤掉 REL 类型
+      const filteredTypes = opt.imageTypeArr.filter(type => type !== _Vvd.VelaImageType.REL);
+
+      // 异步检查每个类型是否需要更新
+      const updateChecks = await Promise.all(filteredTypes.map(async type => ({
+        type,
+        needsUpdate: await this.isLocalImageNeedUpdate(type)
+      })));
+
+      // 过滤和映射
+      const newUrls = updateChecks.filter(item => item.needsUpdate).map(item => ({
+        name: item.type,
+        url: (0, _constants.getImageDownloadUrl)()[item.type]
+      }));
+      urls = urls.concat(newUrls);
+    }
     const downloads = urls.map(async u => {
       const d = await (await ipull).downloadFile({
         url: u.url,
@@ -666,8 +683,8 @@ class VvdManager {
       _ColorConsole.default.warn('All file resources have been successfully downloaded and are being decompressed.');
       for (const u of urls) {
         // 解压
-        const targetDirName = u.name;
-        const targetDir = u.name === _Vvd.SDKParts.SYSTEM_IMAGES ? _path.default.resolve(this.sdkHome, targetDirName, _path.default.basename(u.url).replace('.zip', '')) : _path.default.resolve(this.sdkHome, targetDirName);
+        const targetDirName = (0, _constants.isVelaImageType)(u.name) ? _Vvd.SDKParts.SYSTEM_IMAGES : u.name;
+        const targetDir = u.name === _Vvd.SDKParts.SYSTEM_IMAGES || (0, _constants.isVelaImageType)(u.name) ? _path.default.resolve(this.sdkHome, targetDirName, _path.default.basename(u.url).replace('.zip', '')) : _path.default.resolve(this.sdkHome, targetDirName);
         const targetDirExist = _fs.default.existsSync(targetDir);
         if (!targetDirExist) await _fs.default.promises.mkdir(targetDir, {
           recursive: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.4-beta.1",
+  "version": "2.0.4-beta.2",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -36,7 +36,7 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/shared-utils": "2.0.4-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.4-beta.2",
     "@miwt/adb": "^0.9.0",
     "adm-zip": "^0.5.16",
     "dayjs": "^1.11.12",
@@ -51,5 +51,5 @@
     "@types/adm-zip": "^0.5.5",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "85c4287c7b9468c83d468cfc39b147f4975f8285"
+  "gitHead": "e9015685f29790709c420a9f8c41ade936a85300"
 }