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

package/lib/avd/index.d.ts

@@ -20,5 +20,9 @@ declare class VelaAvdCls {
     getVelaAvdList(): IAvdParams[];
     /** 获取模拟器皮肤列表 */
     getVelaSkinList(): string[];
+    /** 自定义模拟器的镜像目录 */
+    customImageDir(avdName: string, target: string): void;
+    /** 重置自定义的镜像目录  */
+    resetImageDir(avdName: string): void;
 }
 export default VelaAvdCls;

package/lib/avd/index.js

@@ -7,6 +7,7 @@ const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const ini_1 = require("ini");
 const constants_1 = require("../static/constants");
 const Avd_1 = require("../typing/Avd");
 const EAvdParamsToIni = {
@@ -72,12 +73,7 @@ class VelaAvdCls {
             // 写入Vela_Virtual_Device.ini文件
             fs_1.default.writeFileSync(avdIni, nuttxAvdIniContent);
             // 写入Vela_Virtual_Device.avd/config.ini文件
-            const fWrite = fs_1.default.createWriteStream(avdConfigIni);
-            for (const item in configIniJson) {
-                const line = `${item} = ${configIniJson[item]}\n`;
-                fWrite.write(line);
-            }
-            fWrite.close();
+            fs_1.default.writeFileSync(avdConfigIni, (0, ini_1.stringify)(configIniJson));
             return true;
         }
         catch (e) {
@@ -98,22 +94,13 @@ class VelaAvdCls {
         const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
         try {
             const contents = fs_1.default.readFileSync(configIni, 'utf-8');
-            // 这里需要使用惰性匹配
-            const archRegex = /hw.cpu.arch = ([\d\D]+?)\n/;
-            const archMatcher = contents.match(archRegex);
-            const heightRegex = /hw.lcd.height = ([\d\D]+?)\n/;
-            const heightMatcher = contents.match(heightRegex);
-            const widthRegex = /hw.lcd.width = ([\d\D]+?)\n/;
-            const widthMatcher = contents.match(widthRegex);
-            const skinRegex = /skin.name = ([\d\D]+?)\n/;
-            const skinMatcher = contents.match(skinRegex);
-            const imagePathRegex = /image.sysdir.1 = ([\d\D]+?)\n/;
-            const imagePathMather = contents.match(imagePathRegex);
-            archMatcher && (avdInfo.avdArch = archMatcher[1]);
-            heightMatcher && (avdInfo.avdHeight = heightMatcher[1]);
-            widthMatcher && (avdInfo.avdWidth = widthMatcher[1]);
-            skinMatcher && (avdInfo.avdSkin = skinMatcher[1]);
-            imagePathMather && (avdInfo.avdImagePath = imagePathMather[1]);
+            const config = (0, ini_1.parse)(contents);
+            avdInfo.avdArch = config['hw.cpu.arch'];
+            avdInfo.avdHeight = config['hw.lcd.height'];
+            avdInfo.avdWidth = config['hw.lcd.width'];
+            avdInfo.avdSkin = config['skin.name'];
+            avdInfo.avdImagePath = config['image.sysdir.1'];
+            avdInfo.customImagePath = config['image.sysdir.2'];
             return avdInfo;
         }
         catch (err) {
@@ -164,5 +151,23 @@ class VelaAvdCls {
             return [];
         }
     }
+    /** 自定义模拟器的镜像目录 */
+    customImageDir(avdName, target) {
+        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
+        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
+        const contents = fs_1.default.readFileSync(configIni, 'utf-8');
+        const config = (0, ini_1.parse)(contents);
+        config['image.sysdir.2'] = target;
+        fs_1.default.writeFileSync(configIni, (0, ini_1.stringify)(config));
+    }
+    /** 重置自定义的镜像目录  */
+    resetImageDir(avdName) {
+        const currAvdDir = path_1.default.resolve(this.avdHome, `${avdName}.avd`);
+        const configIni = path_1.default.resolve(currAvdDir, 'config.ini');
+        const contents = fs_1.default.readFileSync(configIni, 'utf-8');
+        const config = (0, ini_1.parse)(contents);
+        delete config['image.sysdir.2'];
+        fs_1.default.writeFileSync(configIni, (0, ini_1.stringify)(config));
+    }
 }
 exports.default = VelaAvdCls;

package/lib/instance/dev.js

@@ -125,12 +125,12 @@ class GoldfishInstance extends common_1.default {
             const emulatorBin = this.getEmulatorBinPath();
             shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath } = avdInfo;
+            const { avdArch, avdImagePath, customImagePath } = avdInfo;
             shared_utils_1.ColorConsole.log(`### Emulator ### adb port: ${options.adbPort}`);
             if (!avdImagePath) {
                 return shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
             }
-            const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
+            const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
             shared_utils_1.ColorConsole.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
             // 端口映射
             let portMappingStr = ``;
@@ -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. 启动模拟器
@@ -108,12 +109,12 @@ class MiwearInstance extends common_1.default {
             shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
             // 获取vela镜像的绝对路径
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath } = avdInfo;
+            const { avdArch, avdImagePath, customImagePath } = avdInfo;
             shared_utils_1.ColorConsole.log(`### Emulator ### adb port: ${options.adbPort}`);
             if (!avdImagePath) {
                 return shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
             }
-            const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
+            const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
             shared_utils_1.ColorConsole.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
             // 端口映射
             let portMappingStr = ``;
@@ -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/instance/preDev.js

@@ -177,12 +177,12 @@ class OldGoldfishInstance extends common_1.default {
             shared_utils_1.ColorConsole.log(`### Emulator ### emulator path: ${emulatorBin}`);
             // 获取vela镜像的绝对路径
             const avdInfo = this.velaAvdCls.getVelaAvdInfo(avdName);
-            const { avdArch, avdImagePath } = avdInfo;
+            const { avdArch, avdImagePath, customImagePath } = avdInfo;
             shared_utils_1.ColorConsole.log(`### Emulator ### adb port: ${options.adbPort}`);
             if (!avdImagePath) {
                 return shared_utils_1.ColorConsole.throw(`### Emulator ### Unable to find vela image via avd`);
             }
-            const nuttxBinPath = path_1.default.resolve(avdImagePath, 'nuttx');
+            const nuttxBinPath = path_1.default.resolve(customImagePath || avdImagePath, 'nuttx');
             shared_utils_1.ColorConsole.log(`### Emulator ### nuttx path: ${nuttxBinPath}`);
             // 端口映射，adb端口和debug端口
             let portMappingStr = `user,id=u1,hostfwd=tcp:127.0.0.1:${options.adbPort}-10.0.2.15:5555`;

package/lib/static/avdConfigIni.json

@@ -10,14 +10,14 @@
   "hw.arc": false,
   "hw.audioInput": "yes",
   "hw.battery": "yes",
-  "hw.camera.back": "virtualscene",
-  "hw.camera.front": "emulated",
+  "hw.camera.back": "None",
+  "hw.camera.front": "None",
   "hw.cpu.arch": "arm",
   "hw.cpu.ncore": 4,
   "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,
@@ -36,4 +36,4 @@
   "skin.dynamic": "no",
   "skin.name": "",
   "skin.path": ""
-}
+}

package/lib/static/constants.d.ts

@@ -8,10 +8,17 @@ export declare const defaultToolsHome: string;
 export declare const defaultVncPort = 5900;
 export declare const defaultAdbPort = 5555;
 export declare const defaultDebugPort = 10055;
+/**
+ * vela-release-4.0 ： vela 4.0 带 miwear
+ * vela-pre-4.0     ： vela 4.0 不带 miwear
+ * vela-dev-0.0.4   ： vela 4.0 dev 分支
+ */
 export declare const VelaImageVersionList: {
     label: string;
     value: string;
     time: string;
+    hide: boolean;
+    icon: null;
 }[];
 export declare const EmulatorEnvVersion: {
     name: string;

package/lib/static/constants.js

@@ -16,21 +16,45 @@ exports.defaultToolsHome = path_1.default.resolve(exports.defaultSDKHome, 'tools
 exports.defaultVncPort = 5900;
 exports.defaultAdbPort = 5555;
 exports.defaultDebugPort = 10055;
+// 不确定vela镜像的发布策略，暂时需要手动更新此列表
+// 0.0.2和0.0.3版本比较特殊，线上是一个nuttx文件。其他版本都是一个zip包，包含nuttx data.img和vela_source.img
+/**
+ * vela-release-4.0 ： vela 4.0 带 miwear
+ * vela-pre-4.0     ： vela 4.0 不带 miwear
+ * vela-dev-0.0.4   ： vela 4.0 dev 分支
+ */
 exports.VelaImageVersionList = [
     {
-        label: 'vela正式版（4.0）',
+        label: 'vela-4.0-正式版',
         value: 'vela-release-4.0',
-        time: '2024-04-10T04:10:00'
+        time: '2024-07-15T15:57:00',
+        hide: false,
+        icon: null
     },
     {
-        label: 'vela开发版（dev, 0.0.2）',
-        value: 'vela-dev-0.0.2',
-        time: '2023-12-04T16:31:00'
+        label: 'vela-4.0-测试版',
+        value: 'vela-pre-4.0',
+        time: '2024-07-15T07:07:00',
+        hide: false,
+        icon: null
+    },
+    //  废弃 0.0.2 版本
+    // {
+    //   label: 'vela开发版（dev, 0.0.2）',
+    //   value: 'vela-dev-0.0.2',
+    //   time: '2023-12-04T16:31:00',
+    // },
+    {
+        label: 'vela-dev-开发版',
+        value: 'vela-dev-0.0.4',
+        time: '2024-07-12T11:12:00',
+        hide: true,
+        icon: null
     }
 ];
 exports.EmulatorEnvVersion = {
     name: '模拟器资源版本管理',
-    emulator: '0.0.3',
+    emulator: '0.0.4',
     qa: '0.0.1',
     skins: '0.0.1',
     'system-images': exports.VelaImageVersionList[0].value,

package/lib/typing/Avd.d.ts

@@ -14,6 +14,7 @@ export interface IAvdParams {
     avdHeight: string;
     avdSkin?: string;
     avdImagePath?: string;
+    customImagePath?: string;
 }
 export interface ISkinInfo {
     skinName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/emulator",
-  "version": "2.0.2-beta.11",
+  "version": "2.0.2-beta.13",
   "description": "vela emulator tool.",
   "homepage": "",
   "license": "ISC",
@@ -35,14 +35,16 @@
     "emulator"
   ],
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2-beta.11",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.11",
+    "@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",
     "portfinder": "^1.0.32"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "fs-extra": "^11.2.0"
+    "@types/ini": "^4.1.1"
   },
-  "gitHead": "07c38dd12ba0d932c6dc1fd16fe25aaf15ab9fbb"
+  "gitHead": "30bf14ae958b66937da1b79dcfcd7c436e08af50"
 }