@aiot-toolkit/emulator 2.0.2-beta.10 → 2.0.2-beta.12

package/lib/typing/Instance.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import IJavascriptCompileOption from '@aiot-toolkit/aiotpack/lib/compiler/javascript/interface/IJavascriptCompileOption';
+import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
 import { IAvdResourcePaths } from './Avd';
 export interface INewGoldfishInstanceParams extends IAvdResourcePaths {
     projectPath: string;
@@ -13,7 +13,7 @@ export interface IStartOptions {
     disableNSH?: boolean;
     origin?: 'ide' | 'terminal';
     serverPort?: number;
-    vncPort?: number;
+    grpcPort?: number;
     adbPort: number;
     debugPort?: number;
     stdoutCallback?: (buffer: Buffer) => void;

package/lib/utils/index.d.ts

@@ -11,3 +11,23 @@ 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 | undefined>;

package/lib/utils/index.js

@@ -12,17 +12,18 @@ 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;
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
+exports.getEvenPort = exports.delayRun = exports.tryRun = exports.sleep = exports.killProcessByCmd = exports.killProcessByPid = exports.getSystemArch = void 0;
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 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
@@ -42,7 +43,7 @@ function getSystemArch() {
         }
     }
     if (osArch !== 'arm64' && osArch !== 'x64') {
-        return ColorConsole_1.default.throw(`unsupport system`);
+        return shared_utils_1.ColorConsole.throw(`unsupport system`);
     }
     return cpuArch[osArch];
 }
@@ -50,9 +51,7 @@ 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) {
@@ -82,7 +81,65 @@ 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));
     });
 }
 exports.sleep = sleep;
+/**
+ * 重复执行某个任务直到成功，或者超过最大次数
+ * @param task 任务，需要返回 bool 值表示是否执行成功
+ * @param {Number=} maxCount 最大重试次数
+ * @param {number=} duration 每次重试的间隔
+ */
+function tryRun(task, maxCount = 5, duration = 1000, currentCount = 0) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (currentCount > maxCount)
+            return false;
+        return (Boolean(yield task()) ||
+            (yield delayRun(() => tryRun(task, maxCount, duration, currentCount + 1), duration)));
+    });
+}
+exports.tryRun = tryRun;
+/**
+ * 延迟执行某个任务
+ * @param task
+ * @param duration
+ * @returns
+ */
+function delayRun(task, duration = 1000) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve) => {
+            setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                return resolve(task());
+            }), duration);
+        });
+    });
+}
+exports.delayRun = delayRun;
+/**
+ * 为avdPort寻找一个不被占用的端口
+ * 端口号必须是偶数且在5555和5585之间
+ * @returns {number}
+ */
+function getEvenPort() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const startPort = 5555;
+        const stopPort = 5585;
+        let index = 1;
+        let port = yield portfinder_1.default.getPortPromise({
+            port: startPort,
+            stopPort
+        });
+        while (port % 2 !== 0) {
+            if (index > 30)
+                return false;
+            port = yield portfinder_1.default.getPortPromise({
+                port: startPort + index,
+                stopPort
+            });
+            index++;
+            return port;
+        }
+    });
+}
+exports.getEvenPort = getEvenPort;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.10",
+  "version": "2.0.2-beta.12",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,14 +35,16 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.10",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.10",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.12",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.12",
     "find-process": "^1.4.7",
+    "fs-extra": "^11.2.0",
+    "ini": "^4.1.3",
     "portfinder": "^1.0.32"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "fs-extra": "^11.2.0"
+    "@types/ini": "^4.1.1"
   },
-  "gitHead": "00d23c1ad1306a6c72bb007685de9fd4a6ee61af"
+  "gitHead": "3d2f9f8f48bb88492013d867f6eff27cb33365a0"
 }