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

package/lib/instance/common.js

@@ -133,7 +133,7 @@ class CommonInstance {
     }
     /** 停止模拟器并释放相关资源 */
     stop() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.goldfishProcess) {
                 // Linux删除goldfishProcess后，子进程仍存在，导致模拟器窗口未关闭
@@ -142,7 +142,10 @@ class CommonInstance {
                 //   process.kill(this.goldfishProcess.pid + 1)
                 // }
                 this.killProcess(this.goldfishProcess);
-                yield (0, utils_1.killProcessByCmd)((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.avdName);
+                if ((_a = this.startOptions) === null || _a === void 0 ? void 0 : _a.avdName) {
+                    const emulatorProcessFlag = `-avd ${(_b = this.startOptions) === null || _b === void 0 ? void 0 : _b.avdName} -avd-arch`;
+                    yield (0, utils_1.killProcessByCmd)(emulatorProcessFlag);
+                }
                 this.goldfishProcess = undefined;
             }
         });

package/lib/instance/miwear.js

@@ -45,6 +45,7 @@ const ws_1 = __importStar(require("ws"));
 const constants_1 = require("../static/constants");
 const utils_1 = require("../utils");
 const common_1 = __importDefault(require("./common"));
+const dayjs_1 = __importDefault(require("dayjs"));
 const MAX_RECONNECT_COUNT = 8;
 /**
  * MiwearInstance
@@ -116,15 +117,30 @@ class MiwearInstance extends common_1.default {
             if (devtool) {
                 portMappingStr += `,hostfwd=tcp:127.0.0.1:${options.debugPort}-10.0.2.15:101`;
             }
-            // 文件系统配置，第一次使用fatfs镜像挂载，后续使用adb push更新应用
-            const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.bin');
-            const dataImageBin = path_1.default.resolve(avdImagePath, 'vela_data.bin');
-            const coreBin = path_1.default.resolve(avdImagePath, 'coredump.core');
-            const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBin} \
+            // 设备挂载节点
+            const systemImageBin = path_1.default.resolve(avdImagePath, 'vela_resource.bin'); // 只读
+            const dataImageBin = path_1.default.resolve(avdImagePath, 'vela_data.bin'); // 可读可写
+            const coreBin = path_1.default.resolve(avdImagePath, 'coredump.core'); // 只读
+            // 复制可写文件到AVD目录下（多模拟器实例时需要）
+            const dataImageBinInAvd = path_1.default.join(this.avdHome, `${avdName}.avd`, 'vela_data.bin');
+            if (!fs_extra_1.default.existsSync(dataImageBinInAvd)) {
+                // vela_data.bin不存在时直接copy
+                fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+            }
+            else {
+                // vela_data.bin存在时，如果.export里的时间晚于avd里的时候，说明更新了镜像，需要重新copy
+                const statsInAvd = fs_extra_1.default.statSync(dataImageBinInAvd);
+                const stats = fs_extra_1.default.statSync(dataImageBin);
+                if ((0, dayjs_1.default)(stats.mtime).isAfter(statsInAvd.mtime)) {
+                    fs_extra_1.default.copyFileSync(dataImageBin, dataImageBinInAvd);
+                }
+            }
+            // 挂载节点配置，只读文件加入read-only标识
+            const imageMountStr = `-drive index=0,id=system,if=none,format=raw,file=${systemImageBin},read-only \
 -device virtio-blk-device,bus=virtio-mmio-bus.0,drive=system \
--drive index=1,id=userdata,if=none,format=raw,file=${dataImageBin} \
+-drive index=1,id=userdata,if=none,format=raw,file=${dataImageBinInAvd} \
 -device virtio-blk-device,bus=virtio-mmio-bus.1,drive=userdata \
--drive index=2,id=vendor,if=none,format=raw,file=${coreBin} \
+-drive index=2,id=vendor,if=none,format=raw,file=${coreBin},read-only \
 -device virtio-blk-device,bus=virtio-mmio-bus.4,drive=vendor \
 -device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting`;
             // vnc配置

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.6",
+  "version": "2.0.2-beta.7",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,8 +35,8 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.6",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.6",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.7",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.7",
     "find-process": "^1.4.7",
     "portfinder": "^1.0.32"
   },
@@ -44,5 +44,5 @@
     "@types/fs-extra": "^11.0.4",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "b9b99afff176075380c2ec95b43797d696c393c1"
+  "gitHead": "dc37f9f6fbef3895d17b54ad41274c66f154f670"
 }