@aiot-toolkit/emulator 2.0.2-beta.16 → 2.0.2-beta.18

package/lib/instance/common.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import IManifest from '@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/interface/IManifest';
 import { ChildProcess } from 'child_process';
 import VelaAvdCls from '../avd';

package/lib/instance/common.js

@@ -102,8 +102,8 @@ class CommonInstance {
      * 时间限制为 @param timeout 秒，超时则表示连接失败
      * @returns
      */
-    connectGoldfish(timeout = 10) {
-        return __awaiter(this, void 0, void 0, function* () {
+    connectGoldfish() {
+        return __awaiter(this, arguments, void 0, function* (timeout = 10) {
             let adbConnected = false; // adb是否连接成功
             let enableLoop = true; // 是否允许循环，用于终止adb的连接
             let needKill = false;
@@ -163,8 +163,8 @@ class CommonInstance {
     }
     /** 停止模拟器并释放相关资源 */
     stop() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             if (this.goldfishProcess) {
                 // Linux删除goldfishProcess后，子进程仍存在，导致模拟器窗口未关闭
                 // 这里的作用是手动删除创建出来的子进程
@@ -189,8 +189,8 @@ class CommonInstance {
     }
     /** 创建server */
     createWebsockeServer() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const wsServer = new ws_1.WebSocketServer({
                 port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort
             });

package/lib/instance/dev.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import readline from 'readline';
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
 import CommonInstance from './common';

package/lib/instance/index.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findInstance = exports.PreInstance = exports.OldGoldfishInstance = exports.MiwearInstance = exports.GoldfishInstance = exports.CommonInstance = void 0;
+exports.PreInstance = exports.OldGoldfishInstance = exports.MiwearInstance = exports.GoldfishInstance = exports.CommonInstance = void 0;
+exports.findInstance = findInstance;
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const avd_1 = __importDefault(require("../avd"));
 const common_1 = __importDefault(require("./common"));
@@ -41,4 +42,3 @@ function findInstance(avdName, params) {
     }
     return new dev_1.default(params);
 }
-exports.findInstance = findInstance;

package/lib/instance/miwear.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import readline from 'readline';
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';
 import CommonInstance from './common';

package/lib/instance/miwear.js

@@ -168,8 +168,8 @@ class MiwearInstance extends common_1.default {
      * @param options
      */
     startupQuickApp(options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const { package: appPackageName } = this.projectInfo;
             const releaseDir = this.isRpk
                 ? path_1.default.resolve(this.projectPath, '../')
@@ -190,6 +190,7 @@ class MiwearInstance extends common_1.default {
                 yield adbMiwt.execAdbCmdAsync(`adb -s ${this.sn} shell rm /data/debugger_ip.cfg`);
             }
             this.pushAndInstall(rpkPath, this.appDir);
+            // this.launchQuickapp()
         });
     }
     /**
@@ -264,8 +265,8 @@ class MiwearInstance extends common_1.default {
      * 3. 发送Page.reload命令给调试服务，通知更新
      */
     handleUpdate() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             try {
                 this.reconnectCount = 0;
                 yield this.initDebugSocket();
@@ -344,8 +345,8 @@ class MiwearInstance extends common_1.default {
      * 创建server端，监听打包过程中client端发来的消息
      */
     createWebsockeServer() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const wsServer = new ws_1.WebSocketServer({
                 port: (_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.serverPort
             });

package/lib/instance/preDev.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { ChildProcess } from 'child_process';
 import readline from 'readline';
 import { INewGoldfishInstanceParams, IStartOptions } from '../typing/Instance';

package/lib/typing/Instance.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
 import { IAvdResourcePaths } from './Avd';
 export interface INewGoldfishInstanceParams extends IAvdResourcePaths {

package/lib/utils/index.js

@@ -12,7 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEvenPort = exports.delayRun = exports.tryRun = 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"));
@@ -47,7 +53,6 @@ function getSystemArch() {
     }
     return cpuArch[osArch];
 }
-exports.getSystemArch = getSystemArch;
 /** 根据PID杀死进程 */
 function killProcessByPid(pid) {
     try {
@@ -58,7 +63,6 @@ function killProcessByPid(pid) {
         console.error(`kill process ${pid} get error: ${e}`);
     }
 }
-exports.killProcessByPid = killProcessByPid;
 /**
  * 根据命令杀死进程
  */
@@ -77,37 +81,34 @@ function killProcessByCmd(cmd) {
         }
     });
 }
-exports.killProcessByCmd = killProcessByCmd;
 /** 延迟函数 */
 function sleep(time) {
     return __awaiter(this, void 0, void 0, function* () {
         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* () {
+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)));
     });
 }
-exports.tryRun = tryRun;
 /**
  * 延迟执行某个任务
  * @param task
  * @param duration
  * @returns
  */
-function delayRun(task, duration = 1000) {
-    return __awaiter(this, void 0, void 0, function* () {
+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());
@@ -115,7 +116,6 @@ function delayRun(task, duration = 1000) {
         });
     });
 }
-exports.delayRun = delayRun;
 /**
  * 为avdPort寻找一个不被占用的端口
  * 端口号必须是偶数且在5555和5585之间
@@ -142,4 +142,3 @@ function getEvenPort() {
         return port;
     });
 }
-exports.getEvenPort = getEvenPort;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.16",
+  "version": "2.0.2-beta.18",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,8 +35,8 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.16",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.16",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.18",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.18",
     "@miwt/adb": "^0.9.0",
     "dayjs": "^1.11.12",
     "find-process": "^1.4.7",
@@ -50,5 +50,5 @@
     "@types/fs-extra": "^11.0.4",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "785701c64914f50acd18ab71ea41b2f5a2cd161c"
+  "gitHead": "b73a79ef04edac808f316bf8b8fb1718422daa1c"
 }