feat: HBuilderX 可视化窗口，选择iOS测试，支持iOS真机

Author: wan

package.json

@@ -77,7 +77,7 @@
       },
       {
         "command": "unitest.runTestIOS",
-        "title": "运行测试到ios模拟器"
+        "title": "运行测试到ios"
       },
       {
         "command": "unitest.runTestAndroid",
@@ -575,7 +575,7 @@
         },
         {
           "command": "unitest.runTestIOS",
-          "title": "iOS模拟器(&I)",
+          "title": "iOS(&I)",
           "when": "isMac",
           "group": "unitest@2"
         },
@@ -640,7 +640,7 @@
         },
         {
           "command": "unitest.runCurrentTestIOS",
-          "title": "iOS模拟器(&I)",
+          "title": "iOS(&I)",
           "when": "isMac",
           "group": "unitestForCurrent@2"
         },
@@ -710,7 +710,7 @@
         },
         {
           "command": "unitest.runCurrentTestIOS",
-          "title": "iOS模拟器(&I)",
+          "title": "iOS(&I)",
           "when": "isMac",
           "group": "unitestForCurrent@2"
         },
@@ -838,5 +838,8 @@
   },
   "keywords": [
     "uni-app,test,自动化测试"
-]
+  ],
+  "dependencies": {
+    "adm-zip": "^0.5.17"
+  }
 }

src/HBuilderXCli.js

@@ -35,7 +35,9 @@ const {
     getFileNameForDate
 } = require('./utils/utils_files.js');
 
-const editEnvjsFile = require('./core/edit_env_js_file.js');
+const {
+    editEnvjsFile, loadEnvConfig
+} = require('./core/edit_env_js_file.js');
 const { modifyJestConfigJSFile } = require('./core/edit_jest_config_js_file.js');
 
 const Initialize = require('./Initialize.js');

src/TestCaseRun.js

@@ -17,6 +17,7 @@ const cmpVerionForH5 = compareHBuilderXVersions(hxVersionForDiff, '3.2.10');
 let config = require('./core/config.js');
 
 const getProjectUnicloudData = require("./core/get_project_unicloud_data.js");
+const IOSDeviceHelper = require('./core/ios_device_helper.js');
 const {
     isUniAppCli,
     isUniAppX,
@@ -28,7 +29,8 @@ const {
     checkCustomTestEnvironmentDependency,
     checkUtsProject,
     readUniappManifestJson,
-    uniapp_x_is_vapor
+    uniapp_x_is_vapor,
+    get_ios_device_type
 } = require('./core/core.js');
 
 const {
@@ -40,7 +42,9 @@ const {
     getFileNameForDate
 } = require('./utils/utils_files.js');
 
-const editEnvjsFile = require('./core/edit_env_js_file.js');
+const {
+    editEnvjsFile
+} = require('./core/edit_env_js_file.js');
 const { modifyJestConfigJSFile } = require('./core/edit_jest_config_js_file.js');
 
 const Initialize = require('./Initialize.js');
@@ -527,11 +531,23 @@ class RunTest extends Common {
             maxBuffer: 2000 * 1024
         };
 
-        // 蒸汽模式：依据项目mainfest.json
-        // let isVapor = await uniapp_x_is_vapor(this.projectPath, is_uniapp_cli);
-        // if (typeof isVapor === 'boolean' && isVapor) {
-        //     cmdOpts["env"]["UNI_APP_X_DOM2"] = true;
-        // };
+        // 2026-04 需求：ios需要支持真机 gml要求传递参数 HX_USE_BASE_TYPE
+        if (testPlatform == "ios") {
+            let test_device_type = await get_ios_device_type(deviceId);
+            console.log("test_device_type =>", test_device_type);
+            if (test_device_type == "真机") {
+                const iosHelper = new IOSDeviceHelper();
+                let ipa_path = await iosHelper.get_ios_ipa_path(is_uniapp_x, UNI_APP_X_DOM2, this.UNI_AUTOMATOR_CONFIG);
+                cmdOpts.env.HX_USE_BASE_TYPE = await iosHelper.get_hx_use_base_type(this.UNI_AUTOMATOR_CONFIG);
+                cmdOpts.env.IOS_RUNTIME_NASE_PATH = ipa_path;
+
+                const _utsBaseInfo = await iosHelper.get_uts_base_info(is_uniapp_x, ipa_path);
+                cmdOpts.env.UTS_BASE_INFO = _utsBaseInfo ? JSON.stringify(_utsBaseInfo) : '';
+                if (_utsBaseInfo == null) {
+                    createOutputChannel(`[iOS真机测试] 未能从IPA包中读取到UTS基础信息，可能会导致测试运行异常，请检查！`, 'warning');
+                };
+            };
+        };
 
         // 蒸汽模式：设备选择窗口的配置设置
         if (UNI_APP_X_DOM2 === true) {
@@ -820,7 +836,10 @@ class RunTest extends Common {
             "is_uniapp_cli": is_uniapp_cli
         };
         let changeResult = await modifyJestConfigJSFile(scope, proj);
-        if (changeResult == false) return;
+        if (changeResult == false) {
+            logger("修改测试范围失败，测试中止。");
+            return;
+        };
 
         // 注意：以前叫h5, 后来uni-app x要求改名为web。为了兼容以前的命令行参数，虽然入参是web，但是转化为h5。
         switch (argv_uniPlatform) {

src/core/config.js

@@ -20,15 +20,18 @@ const HBuilderX_NPM_PATH = path.join(hx.env.appRoot, "plugins", "npm", "npm");
 const LAUNCHER_PATH = path.join(hx.env.appRoot, "plugins", "launcher");
 const LAUNCHER_ANDROID = path.join(LAUNCHER_PATH, "base/android_base.apk");
 const LAUNCHER_IOS = path.join(LAUNCHER_PATH, "base/Pandora_simulator.app");
+const LAUNCHER_IOS_IPA = path.join(LAUNCHER_PATH, "base/iPhone_base.ipa");
 const LAUNCHER_VERSION_TXT = path.join(LAUNCHER_PATH, "base", "version.txt");
 
 const UNIAPP_X_LAUNCHER_PATH = path.join(hx.env.appRoot, "plugins", "uniappx-launcher");
 const UNIAPP_X_LAUNCHER_IOS = path.join(UNIAPP_X_LAUNCHER_PATH, "base/Pandora_simulator.app");
+const UNIAPP_X_LAUNCHER_IOS_IPA = path.join(UNIAPP_X_LAUNCHER_PATH, "base/iPhone_base.ipa");
 const UNIAPP_X_LAUNCHER_ANDROID = path.join(UNIAPP_X_LAUNCHER_PATH, "base/android_base.apk");
 const UNIAPP_X_LAUNCHER_VERSION_TXT = path.join(UNIAPP_X_LAUNCHER_PATH, "base", "version.txt");
 
 const UNIAPP_X_VAPOR_LAUNCHER_PATH = path.join(hx.env.appRoot, "plugins", "uniappx-vapor-launcher");
 const UNIAPP_X_VAPOR_LAUNCHER_IOS = path.join(UNIAPP_X_VAPOR_LAUNCHER_PATH, "base/Pandora_simulator.app");
+const UNIAPP_X_VAPOR_LAUNCHER_IOS_IPA = path.join(UNIAPP_X_VAPOR_LAUNCHER_PATH, "base/iPhone_base.ipa");
 const UNIAPP_X_VAPOR_LAUNCHER_ANDROID = path.join(UNIAPP_X_VAPOR_LAUNCHER_PATH, "base/android_base.apk");
 const UNIAPP_X_VAPOR_LAUNCHER_VERSION_TXT = path.join(UNIAPP_X_VAPOR_LAUNCHER_PATH, "base", "version.txt");
 
@@ -85,16 +88,19 @@ module.exports = {
     LAUNCHER_PATH,
     LAUNCHER_ANDROID,
     LAUNCHER_IOS,
+    LAUNCHER_IOS_IPA,
     LAUNCHER_VERSION_TXT,
 
     UNIAPP_X_LAUNCHER_PATH,
     UNIAPP_X_LAUNCHER_ANDROID,
     UNIAPP_X_LAUNCHER_IOS,
+    UNIAPP_X_LAUNCHER_IOS_IPA,
     UNIAPP_X_LAUNCHER_VERSION_TXT,
 
     UNIAPP_X_VAPOR_LAUNCHER_PATH,
     UNIAPP_X_VAPOR_LAUNCHER_ANDROID,
     UNIAPP_X_VAPOR_LAUNCHER_IOS,
+    UNIAPP_X_VAPOR_LAUNCHER_IOS_IPA,
     UNIAPP_X_VAPOR_LAUNCHER_VERSION_TXT,
 
     UNI_CLI_PATH,

src/core/core.js

@@ -584,19 +584,42 @@ async function readUniappManifestJson(project_path, is_uniapp_cli, field) {
     });
     return result;
 };
-
- /**
- * @description 获取项目是否是vapor
- */
-async function uniapp_x_is_vapor(projectPath, is_uniapp_cli=false) {
-    try {
-        let fdata = await readUniappManifestJson(projectPath, is_uniapp_cli, "uni-app-x");
-        let { data } = fdata;
-        return data["vapor"];
-    } catch (error) {
-        return false
-    }
-};
+
+ /**
+ * @description 获取项目是否是vapor
+ */
+async function uniapp_x_is_vapor(projectPath, is_uniapp_cli=false) {
+    try {
+        let fdata = await readUniappManifestJson(projectPath, is_uniapp_cli, "uni-app-x");
+        let { data } = fdata;
+        return data["vapor"];
+    } catch (error) {
+        return false
+    }
+};
+
+
+/**
+ * @description 获取ios设备类型： 真机 | 模拟器
+ * @param {Object} deviceId
+ */
+async function get_ios_device_type(deviceId) {
+    let test_device_type = "";
+    try {
+        let device_result = global.global_devicesList;
+        let ios_sim_list = device_result.ios_simulator ? device_result?.ios_simulator : [];
+        let ios_phone_list = device_result.ios_phone ? device_result?.ios_phone : [];
+        let ios_list = [...ios_phone_list, ...ios_sim_list];
+        for (let s of ios_list) {
+            if (s.udid == deviceId) {
+                test_device_type = s.device_type;
+                break;
+            };
+        };
+    } catch (error) {};
+    return test_device_type;
+};
+
 
 module.exports = {
     getPluginConfig,
@@ -612,6 +635,7 @@ module.exports = {
     installTerminal,
     checkCustomTestEnvironmentDependency,
     checkUtsProject,
-    readUniappManifestJson,
-    uniapp_x_is_vapor
+    readUniappManifestJson,
+    uniapp_x_is_vapor,
+    get_ios_device_type
 };

src/core/edit_env_js_file.js

@@ -3,7 +3,8 @@ const hx = require('hbuilderx');
 let config = require('./config.js');
 const {
     createOutputChannel,
-    getPluginConfig
+    getPluginConfig,
+    get_ios_device_type
 } = require('./core.js');
 
 const {
@@ -53,16 +54,20 @@ function loadEnvConfig(envJsPath) {
  * @param {Object} envjs - env.js配置对象
  * @returns {Promise<String>} 启动器路径
  */
-async function getLauncherPath(testPlatform, isUniappX, isVapor, envjs) {
+async function getLauncherPath(testPlatform, isUniappX, isVapor, envjs, test_device_type="") {
+    // console.error("[test_device_type] = ", test_device_type);
+    const isIOSRealDevice = testPlatform === PLATFORM.IOS && test_device_type === "真机";
+    
     const launcherConfig = {
         [PLATFORM.ANDROID]: {
             uniappX: isVapor ? config.UNIAPP_X_VAPOR_LAUNCHER_ANDROID : config.UNIAPP_X_LAUNCHER_ANDROID,
             normal: config.LAUNCHER_ANDROID
         },
-        // ios真机、模拟器，所需的文件不一样。由于uni-app测试框架不支持ios真机。这里暂不区分。
         [PLATFORM.IOS]: {
-            uniappX: isVapor ? config.UNIAPP_X_VAPOR_LAUNCHER_IOS : config.UNIAPP_X_LAUNCHER_IOS,
-            normal: config.LAUNCHER_IOS
+            uniappX: isIOSRealDevice 
+                ? (isVapor ? config.UNIAPP_X_VAPOR_LAUNCHER_IOS_IPA : config.UNIAPP_X_LAUNCHER_IOS_IPA)
+                : (isVapor ? config.UNIAPP_X_VAPOR_LAUNCHER_IOS : config.UNIAPP_X_LAUNCHER_IOS),
+            normal: isIOSRealDevice ? config.LAUNCHER_IOS_IPA : config.LAUNCHER_IOS
         }
     };
 
@@ -127,13 +132,13 @@ function getPlatformConfigNode(envjs, isUniappX) {
 function updateVersionInfo(envjs, isUniappX, isVapor) {
     if (!envjs['app-plus']) {
         envjs['app-plus'] = {};
-    };
-    let versionTxtFile = config.LAUNCHER_VERSION_TXT;
-    if (isUniappX) {
-        versionTxtFile = config.UNIAPP_X_LAUNCHER_VERSION_TXT;
-    };
-    if (isVapor) {
-        versionTxtFile = config.UNIAPP_X_VAPOR_LAUNCHER_VERSION_TXT;
+    };
+    let versionTxtFile = config.LAUNCHER_VERSION_TXT;
+    if (isUniappX) {
+        versionTxtFile = config.UNIAPP_X_LAUNCHER_VERSION_TXT;
+    };
+    if (isVapor) {
+        versionTxtFile = config.UNIAPP_X_VAPOR_LAUNCHER_VERSION_TXT;
     };
     if (isUniappX) {
         const oldVersionTxtFile = envjs['app-plus']?.['uni-app-x']?.version;
@@ -221,7 +226,8 @@ async function handleWeixinPlatform(envjs, envJsPath, logger) {
         return false;
     }
     return true;
-}
+};
+
 
 /**
  * @description 修改测试配置文件env.js， ios和android测试需要在env.js指定设备ID
@@ -235,17 +241,22 @@ async function handleWeixinPlatform(envjs, envJsPath, logger) {
  * @returns {Promise<Boolean>} - 修改成功返回true，失败返回false
  */
 async function editEnvjsFile(envJsPath = "", testPlatform = "", deviceId = "", uniProjectAttributeData = {}, terminalId) {
-    const {
-        is_uniapp_x: isUniappX,
-        is_uniapp_x_vapor: isVapor
-    } = uniProjectAttributeData;
-    console.error("isVapor = ", isVapor);
+    const {
+        is_uniapp_x: isUniappX,
+        is_uniapp_x_vapor: isVapor
+    } = uniProjectAttributeData;
+    console.error("isVapor = ", isVapor);
 
     const logger = createLogger(terminalId);
-
     if (terminalId) {
         await logger(`[uniapp.test] 修改测试配置文件: ${envJsPath}`);
-    }
+    };
+
+    // 设备类型 模拟器、真机。目前只有ios平台需要
+    let test_device_type = "";
+    if (testPlatform == "ios") {
+        test_device_type = await get_ios_device_type(deviceId);
+    };
 
     let envJsFileData = loadEnvConfig(envJsPath);
     if (!envJsFileData) {
@@ -263,7 +274,7 @@ async function editEnvjsFile(envJsPath = "", testPlatform = "", deviceId = "", u
         return await handleWeixinPlatform(envJsFileData, envJsPath, logger);
     };
 
-    const launcherPath = await getLauncherPath(testPlatform, isUniappX, isVapor, envJsFileData);
+    const launcherPath = await getLauncherPath(testPlatform, isUniappX, isVapor, envJsFileData, test_device_type);
     console.log("[env.js]launcherPath = ", launcherPath)
     const isCustomRuntime = envJsFileData["is-custom-runtime"];
 
@@ -288,4 +299,7 @@ async function editEnvjsFile(envJsPath = "", testPlatform = "", deviceId = "", u
     return true;
 };
 
-module.exports = editEnvjsFile;
+module.exports = {
+    editEnvjsFile,
+    loadEnvConfig
+};