aiot-toolkit 2.0.3-beta.7 → 2.0.3-beta.9

package/lib/utils/RequestUtils.js

@@ -1,75 +1,61 @@
 "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 });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const axios_1 = __importDefault(require("axios"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _axios = _interopRequireDefault(require("axios"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * RequestUtils
  */
 class RequestUtils {
-    static sendReq(client, api, params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => {
-                const requrl = `http://${client.ip}:${client.port}${api}`;
-                let options = {
-                    host: client.ip,
-                    port: client.port,
-                    path: api,
-                    timeout: 3000
-                };
-                if (params) {
-                    options = Object.assign({}, options, {
-                        headers: params
-                    });
-                }
-                axios_1.default
-                    .post(requrl, options)
-                    .then((data) => {
-                    shared_utils_1.ColorConsole.log(`### App Server ### Request ${requrl} succeeded`);
-                    resolve(data.toString());
-                })
-                    .catch((error) => {
-                    if (error.respose && error.response.status === 408) {
-                        // 超时处理
-                        shared_utils_1.ColorConsole.error(`### App Server ### Request ${requrl} timed out, please try again`);
-                    }
-                    else {
-                        shared_utils_1.ColorConsole.error(`### App Server ### Request ${requrl} error message: ${(error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'}`);
-                    }
-                });
-            });
+  static async sendReq(client, api, params) {
+    return new Promise(resolve => {
+      const requrl = `http://${client.ip}:${client.port}${api}`;
+      let options = {
+        host: client.ip,
+        port: client.port,
+        path: api,
+        timeout: 3000
+      };
+      if (params) {
+        options = Object.assign({}, options, {
+          headers: params
         });
-    }
-    static downloadFile(url, fileName) {
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            // 开始下载
-            shared_utils_1.ColorConsole.log(`Start downloading file：${fileName}, address：${url}`);
-            const response = yield axios_1.default.get(url, {
-                responseType: 'arraybuffer'
-            });
-            if (response.status === 200) {
-                const targetDir = path_1.default.join(__dirname, './apk');
-                fs_extra_1.default.ensureDirSync(targetDir);
-                fs_extra_1.default.writeFileSync(path_1.default.join(targetDir, fileName), response.data);
-                resolve(`Download file ${fileName} successfully`);
-            }
-            else {
-                reject(`Download failed, status code：${response.status}`);
-            }
-        }));
-    }
+      }
+      _axios.default.post(requrl, options).then(data => {
+        _sharedUtils.ColorConsole.log(`### App Server ### Request ${requrl} succeeded`);
+        resolve(data.toString());
+      }).catch(error => {
+        if (error.respose && error.response.status === 408) {
+          // 超时处理
+          _sharedUtils.ColorConsole.error(`### App Server ### Request ${requrl} timed out, please try again`);
+        } else {
+          _sharedUtils.ColorConsole.error(`### App Server ### Request ${requrl} error message: ${error?.toString() || 'unknown error'}`);
+        }
+      });
+    });
+  }
+  static downloadFile(url, fileName) {
+    return new Promise(async (resolve, reject) => {
+      // 开始下载
+      _sharedUtils.ColorConsole.log(`Start downloading file：${fileName}, address：${url}`);
+      const response = await _axios.default.get(url, {
+        responseType: 'arraybuffer'
+      });
+      if (response.status === 200) {
+        const targetDir = _path.default.join(__dirname, './apk');
+        _fsExtra.default.ensureDirSync(targetDir);
+        _fsExtra.default.writeFileSync(_path.default.join(targetDir, fileName), response.data);
+        resolve(`Download file ${fileName} successfully`);
+      } else {
+        reject(`Download failed, status code：${response.status}`);
+      }
+    });
+  }
 }
-exports.default = RequestUtils;
+var _default = exports.default = RequestUtils;

package/lib/utils/VelaAvdUtils.d.ts

@@ -1,61 +1,16 @@
-import { VelaAvdCls } from '@aiot-toolkit/emulator';
-declare class VelaAvdUtils {
+import { VvdManager } from '@aiot-toolkit/emulator';
+declare class VelaVvdUtils {
     static sdkHome: string;
-    static avdHome: string;
-    static baseUrl: string;
-    static versionUrl: string;
-    static emulatorBaseUrl: string;
-    static systemImageBaseUrl: string;
-    static velaAvdCls: VelaAvdCls;
-    /** 校验AVD名称 */
-    static validateAvdName(avdName: string): true | "Please enter avd name" | "The avd name must starts with Vela" | "The avd already exists. Please change avd name";
-    /**
-     * 从CDN上下载资源文件
-     * @param downloadUrl 下载地址
-     * @param targetDir 下载后的文件存放的目录
-     * @param filename 下载文件的名称
-     * @returns
-     */
-    static downloadFromCdn(downloadUrl: string, targetDir: string, filename: string): Promise<void>;
-    /**
-     * 下载zip文件并解压。会将zip里的所有文件解压至targetDir
-     * @param downloadUrl 下载地址
-     * @param targetDir 解压目录
-     * @returns
-     */
-    static downloadAndUnzip(downloadUrl: string, targetDir: string): Promise<void>;
-    /** 根据host获取模拟器下载地址 */
-    static getEmulatorUrl(version?: string): string;
-    /** 获取模拟器平台的名称，darwin-aarch64 linux-aarch64 windows-x86_64等 */
-    static getEmulatorPlatform(): string;
-    /** 获取各项模拟器资源的根目录 */
-    static getEmulatorEnvHome(resourceName: string): string;
-    /**
-     * Vela镜像需要更新
-     * @param imageId 镜像id
-     * @returns {boolean}
-     */
-    static velaImageNeedUpdate(imageId: string): boolean;
-    /**
-     * Vela镜像是否为zip包（是否为0.0.2版本）
-     * 只有Vela开发版（dev, 0.0.2）这个版本的镜像不是zip包
-     * @param velaImage
-     * @returns
-     */
-    static isZipInImageUrl(velaImage: string): boolean;
-    /** 获取vela镜像的下载地址 */
-    static getSystemImageUrl(version?: string): string;
-    /** 获取模拟器其他资源的下载地址 */
-    static getDownloadUrl(dir: string, version?: string, filename?: string): string;
-    /** 根据host获取ya-vm-file-server下载地址 */
-    static getv9fsToolUrl(version?: string): string;
-    /** 获取镜像构建时间 */
-    static getImageBuildTime(imageId: string): string | Date | undefined;
+    static vvdHome: string;
+    static vvdManager: VvdManager;
+    /** 校验VVD名称 */
+    static validateVvdName(vvdName: string): true | "Please enter vvd name" | "The vvd name must starts with Vela" | "The vvd already exists. Please change vvd name";
     /**
      * 命令行访问方式创建模拟器
      */
-    static createVelaAvdByInquire(): Promise<void>;
+    static createVelaVvdByInquire(): Promise<void>;
+    static checkEmulatorEnv(): Promise<boolean>;
     /** 初始化/重置模拟器环境 */
     static initEmulatorEnv(): Promise<void>;
 }
-export default VelaAvdUtils;
+export default VelaVvdUtils;