@aiot-toolkit/emulator 2.0.2-dev.6 → 2.0.2-dev.7

package/lib/avd/index.js

@@ -21,6 +21,9 @@ class VelaAvdCls {
         const { avdHome, sdkHome } = avdResourcePaths;
         this.avdHome = avdHome || constants_1.defaultAvdHome;
         this.sdkHome = sdkHome || constants_1.defaultSDKHome;
+        if (!fs_1.default.existsSync(this.avdHome)) {
+            fs_1.default.mkdirSync(this.avdHome, { recursive: true });
+        }
     }
     createVelaAvd(avdParams) {
         const { avdName, avdArch, avdWidth, avdHeight, avdSkin, avdImagePath = constants_1.defaultImageHome } = avdParams;

package/lib/instance/miwear.d.ts

@@ -7,6 +7,7 @@ import CommonInstance from './common';
 declare class MiwearInstance extends CommonInstance {
     private appPathInEmulator;
     private debugSocket?;
+    private reconnectCount;
     constructor(params: INewGoldfishInstanceParams);
     /** 在goldfish模拟器中运行快应用 */
     start(options: IStartOptions): Promise<void>;

package/lib/instance/miwear.js

@@ -40,12 +40,14 @@ const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/C
 const adbMiwt = __importStar(require("@miwt/adb"));
 const child_process_1 = require("child_process");
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const portfinder_1 = __importDefault(require("portfinder"));
 const ws_1 = __importStar(require("ws"));
 const constants_1 = require("../static/constants");
 const utils_1 = require("../utils");
 const common_1 = __importDefault(require("./common"));
+const MAX_RECONNECT_COUNT = 8;
 /**
  * MiwearInstance
  * 针对 vela4.0 的镜像
@@ -54,6 +56,7 @@ class MiwearInstance extends common_1.default {
     constructor(params) {
         super(params);
         this.appPathInEmulator = '/data/quickapp/app';
+        this.reconnectCount = 0;
     }
     /** 在goldfish模拟器中运行快应用 */
     start(options) {
@@ -95,6 +98,7 @@ class MiwearInstance extends common_1.default {
             // 端口映射
             let portMappingStr = `-network-user-mode-options hostfwd=tcp:127.0.0.1:${this.adbPort}-10.0.2.15:5555`;
             if (devtool) {
+                this.debugPort = yield portfinder_1.default.getPortPromise({ port: this.debugPort });
                 portMappingStr += `,hostfwd=tcp:127.0.0.1:${this.debugPort}-10.0.2.15:101`;
             }
             // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
@@ -240,36 +244,65 @@ class MiwearInstance extends common_1.default {
         });
     }
     initDebugSocket() {
-        if (this.debugSocket) {
+        if (this.debugSocket && this.debugSocket.OPEN) {
             return Promise.resolve();
         }
         this.debugSocket = new ws_1.default(`ws://localhost:${this.debugPort}`);
-        this.debugSocket.onopen = e => {
-            ColorConsole_1.default.info(`### debugSocket connect success`);
+        this.debugSocket.onopen = () => {
+            ColorConsole_1.default.info(`### Emulator debugSocket connect success`);
             return Promise.resolve();
         };
         this.debugSocket.onerror = (e) => {
-            ColorConsole_1.default.error(`### Emulator ${e.data}`);
+            var _a;
+            // 重连机制
+            (_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.terminate();
+            if (this.reconnectCount < MAX_RECONNECT_COUNT) {
+                ColorConsole_1.default.info(`### Emulator the ${this.reconnectCount + 1}th time to reconnect debug server`);
+                this.reconnectCount++;
+                setTimeout(() => this.initDebugSocket(), 2000);
+            }
+            else {
+                this.debugSocket = undefined;
+                this.reconnectCount = 0;
+                return Promise.reject(`### Emulator debugSocket connect failed`);
+            }
         };
         this.debugSocket.onclose = (e) => {
-            ColorConsole_1.default.error(`### Emulator debugSocket connect close: ${e.data}`);
             this.debugSocket = undefined;
+            this.reconnectCount = 0;
+            ColorConsole_1.default.log(`### Emulator debugSocket connect close: ${e.data}`);
         };
     }
     /** 通知模拟器更新 */
     handleUpdate() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.initDebugSocket();
-            // 1. 将整包重新推到miwear中（TODO：增量更新）
-            const sn = `127.0.0.1:${this.adbPort}`;
-            const { package: appPackageName } = this.projectInfo;
-            const sourcePath = path_1.default.resolve(this.projectPath, './build/*');
-            yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourcePath} ${this.appPathInEmulator}/${appPackageName}`);
-            ColorConsole_1.default.info(`### Emulator push to ${this.appPathInEmulator}/${appPackageName} successfully`);
-            // 2. 下发CDP命令给调试服务告知刷新
-            if (((_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.readyState) === ws_1.default.OPEN) {
-                (_b = this.debugSocket) === null || _b === void 0 ? void 0 : _b.send(JSON.stringify({ id: 10000, method: 'Page.reload', params: {} }));
+            try {
+                this.reconnectCount = 0;
+                yield this.initDebugSocket();
+                // 1. 将整包重新推到miwear中（TODO：增量更新）
+                const sn = `127.0.0.1:${this.adbPort}`;
+                const { package: appPackageName } = this.projectInfo;
+                // windows平台adb push时无法使用通配符，需另外处理
+                if (os_1.default.platform() === 'win32') {
+                    const rmCmd = `adb -s ${sn} shell rm -r ${this.appPathInEmulator}/${appPackageName}`;
+                    yield adbMiwt.execAdbCmdAsync(rmCmd);
+                    const sourcePath = path_1.default.resolve(this.projectPath, './build');
+                    const pushCmd = `adb -s ${sn} push ${sourcePath} ${this.appPathInEmulator}/${appPackageName}`;
+                    yield adbMiwt.execAdbCmdAsync(pushCmd);
+                }
+                else {
+                    const sourcePath = path_1.default.resolve(this.projectPath, './build/*');
+                    yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourcePath} ${this.appPathInEmulator}/${appPackageName}`);
+                }
+                ColorConsole_1.default.info(`### Emulator push to ${this.appPathInEmulator}/${appPackageName} successfully`);
+                // 2. 下发CDP命令给调试服务告知刷新
+                if (((_a = this.debugSocket) === null || _a === void 0 ? void 0 : _a.readyState) === ws_1.default.OPEN) {
+                    (_b = this.debugSocket) === null || _b === void 0 ? void 0 : _b.send(JSON.stringify({ id: 10000, method: 'Page.reload', params: {} }));
+                }
+            }
+            catch (e) {
+                ColorConsole_1.default.error(`${e}`);
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-dev.6",
+  "version": "2.0.2-dev.7",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,10 +35,9 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-dev.6",
-    "@aiot-toolkit/shared-utils": "2.0.2-dev.6",
+    "@aiot-toolkit/aiotpack": "2.0.2-dev.7",
+    "@aiot-toolkit/shared-utils": "2.0.2-dev.7",
     "find-process": "^1.4.7",
     "portfinder": "^1.0.32"
-  },
-  "gitHead": "736a21d4d2f4fcc102766312d2529e426f27b6c4"
+  }
 }