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

package/lib/instance/dev.js

@@ -241,7 +241,8 @@ class GoldfishInstance extends common_1.default {
             const basename = path_1.default.basename(sourceRoot);
             if (os_1.default.platform() === 'win32' || this.projectPath.indexOf(' ') > 0) {
                 // windows系统或者项目路径有空格：1. adb push目录；2. 在模拟器中使用mv命令重命名
-                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push ${sourceRoot} ${this.appRunDir}`);
+                // 注意 sourceRoot 中可能会有空格
+                yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} push "${sourceRoot}" ${this.appRunDir}`);
                 yield adbMiwt.execAdbCmdAsync(`adb -s ${sn} shell  mv ${this.appRunDir}/${basename} ${this.appRunDir}/${appPackageName}`);
             }
             else {

package/lib/instance/miwear.d.ts

@@ -11,6 +11,7 @@ declare class MiwearInstance extends CommonInstance {
     private debugSocket?;
     private reconnectCount;
     emulatorStartedFlag: RegExp;
+    installBol: boolean;
     constructor(params: INewGoldfishInstanceParams);
     /**
      * 1. 启动模拟器
@@ -49,6 +50,10 @@ declare class MiwearInstance extends CommonInstance {
     installRpkToAppList(rpkPath: string, targetDir: string): Promise<void>;
     /** 使用am start启动快应用 */
     launchQuickapp(): Promise<void>;
+    /** 命令行模式下添加重复调用防止app无法拉起
+     * 主要用将子进程的流输出到主进程后，由于流写入的过多可能会影响事件循环
+     */
+    pmInstallApp(maxRepeats: number, count?: number): void;
     /** 连接模拟器中的调试服务，创建debugSocket
      * 主要用于热更新时，通过debugSocket通知调试服务更新页面
      * 设置了重连机制，会重复连接8次

package/lib/instance/miwear.js

@@ -58,6 +58,7 @@ class MiwearInstance extends common_1.default {
         this.appPathInEmulator = '/data/quickapp/app';
         this.reconnectCount = 0;
         this.emulatorStartedFlag = /quickapp_rpk_installer_init|rpk installer init done/;
+        this.installBol = false;
     }
     /**
      * 1. 启动模拟器
@@ -165,6 +166,26 @@ class MiwearInstance extends common_1.default {
                     shell: true,
                     cwd: this.sdkHome
                 });
+                // 处理origin为terminal
+                if (origin === 'terminal') {
+                    process.stdout.pipe(this.goldfishProcess.stdin);
+                    //setTimeout是为了解决window环境报错
+                    const stdoutPipe = () => {
+                        var _a, _b, _c, _d;
+                        (_b = (_a = this.goldfishProcess) === null || _a === void 0 ? void 0 : _a.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
+                        (_d = (_c = this.goldfishProcess) === null || _c === void 0 ? void 0 : _c.stderr) === null || _d === void 0 ? void 0 : _d.pipe(process.stderr);
+                    };
+                    if (this.goldfishProcess.connected) {
+                        stdoutPipe();
+                    }
+                    else {
+                        setTimeout(stdoutPipe, 0);
+                    }
+                    //setTimeout加一层保险防止app无法拉起
+                    setTimeout(() => {
+                        this.pmInstallApp && this.pmInstallApp(10);
+                    }, 10000);
+                }
                 // 监听模拟器的退出事件
                 this.goldfishProcess.on('exit', (code) => {
                     shared_utils_1.ColorConsole.error(`### Emulator ### Goldfish emulator exited with code ${code}`);
@@ -180,10 +201,14 @@ class MiwearInstance extends common_1.default {
                 // 监听输出流
                 (_c = (_b = this.goldfishProcess) === null || _b === void 0 ? void 0 : _b.stdout) === null || _c === void 0 ? void 0 : _c.on('data', (data) => {
                     const msg = data.toString();
-                    const stdoutCb = options.stdoutCallback || console.log;
-                    stdoutCb(msg);
+                    if (origin === 'ide') {
+                        const stdoutCb = options.stdoutCallback || console.log;
+                        stdoutCb(msg);
+                    }
                     // 应用安装成功，则启动它
                     if (msg.match(/InstallState_Finished|install finished/)) {
+                        if (origin === 'terminal')
+                            this.installBol = true;
                         shared_utils_1.ColorConsole.info(`### Emulator ### Install quickapp successfully`);
                         this.launchQuickapp();
                     }
@@ -259,6 +284,33 @@ class MiwearInstance extends common_1.default {
             adbMiwt.execAdbCmdAsync(startCmd);
         });
     }
+    /** 命令行模式下添加重复调用防止app无法拉起
+     * 主要用将子进程的流输出到主进程后，由于流写入的过多可能会影响事件循环
+     */
+    pmInstallApp(maxRepeats, count = 0) {
+        var _a;
+        const releaseDir = this.isRpk
+            ? path_1.default.resolve(this.projectPath, '../')
+            : path_1.default.resolve(this.projectPath, ((_a = this.params.compilerOption) === null || _a === void 0 ? void 0 : _a.releasePath) || 'dist');
+        const { package: packageName } = this.projectInfo;
+        const files = fs_extra_1.default
+            .readdirSync(releaseDir)
+            .filter((item) => item.includes(packageName) && item.endsWith('.rpk'));
+        const targetDir = path_1.default.resolve(releaseDir, files[0]);
+        const targetPath = `${targetDir}/${packageName}.rpk`;
+        const installCmd = `adb -s ${this.sn} shell pm install  ${targetPath}`;
+        if (count < maxRepeats - 1 && !this.installBol) {
+            count++;
+            shared_utils_1.ColorConsole.info(`### Emulator ### Excuting cmd: terminalr ${installCmd}`);
+            adbMiwt.execAdbCmdAsync(installCmd);
+            setTimeout(() => {
+                this.pmInstallApp(maxRepeats, count);
+            }, 6000);
+        }
+        else {
+            return;
+        }
+    }
     /** 连接模拟器中的调试服务，创建debugSocket
      * 主要用于热更新时，通过debugSocket通知调试服务更新页面
      * 设置了重连机制，会重复连接8次

package/lib/static/avdConfigIni.json

@@ -17,7 +17,7 @@
   "hw.dPad": "no",
   "hw.gps": "yes",
   "hw.gpu.enabled": "no",
-  "hw.gpu.mode ": "off",
+  "hw.gpu.mode": "off",
   "hw.initialOrientation": "Portrait",
   "hw.keyboard": "yes",
   "hw.lcd.density": 420,

package/lib/static/constants.js

@@ -34,7 +34,7 @@ exports.VelaImageVersionList = [
     {
         label: 'vela-4.0-测试版',
         value: 'vela-pre-4.0',
-        time: '2024-07-151T07:07:00',
+        time: '2024-07-15T07:07:00',
         hide: false,
         icon: null
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.12",
+  "version": "2.0.2-beta.13",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,8 +35,8 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.12",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.12",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.13",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.13",
     "find-process": "^1.4.7",
     "fs-extra": "^11.2.0",
     "ini": "^4.1.3",
@@ -46,5 +46,5 @@
     "@types/fs-extra": "^11.0.4",
     "@types/ini": "^4.1.1"
   },
-  "gitHead": "3d2f9f8f48bb88492013d867f6eff27cb33365a0"
+  "gitHead": "30bf14ae958b66937da1b79dcfcd7c436e08af50"
 }