zcw-shared 1.45.0 → 1.46.1

package/dist/functions/uniapp/app-plus/buildIOSApp.js

@@ -10,33 +10,32 @@ import { configureIOSPermissions } from '../../ios/configurePermissions';
 import { modifyInfoPlistKeyValue } from '../../ios/modifyInfoPlistKeyValue';
 import { safelyModifyProjectPbxproj } from '../../ios/safelyModifyProjectPbxproj';
 export async function buildIOSApp(options, deps) {
-    const logs = [];
     if (!options.uniappProjectPath) {
         return {
             success: false,
             error: 'uniappProjectPath 是必需的',
-            logs
+            logs: []
         };
     }
     if (!options.projectPath) {
         return {
             success: false,
             error: 'projectPath 是必需的',
-            logs
+            logs: []
         };
     }
     if (!options.uniAppId) {
         return {
             success: false,
             error: 'uniAppId 是必需的',
-            logs
+            logs: []
         };
     }
     if (!options.displayName) {
         return {
             success: false,
             error: 'displayName 是必需的',
-            logs
+            logs: []
         };
     }
     try {
@@ -47,16 +46,16 @@ export async function buildIOSApp(options, deps) {
             return {
                 success: false,
                 error: `在 ${options.projectPath} 中未找到 Xcode 项目文件（.xcodeproj）`,
-                logs
+                logs: []
             };
         }
         const projectFile = projectFiles[0];
         const projectName = options.sourceDirectoryName || projectFile.replace(/\.xcodeproj$/, '');
-        logs.push(`找到 Xcode 项目: ${projectFile}`);
+        deps.log(`找到 Xcode 项目: ${projectFile}`);
         if (options.sourceDirectoryName) {
-            logs.push(`使用指定的源码目录: ${projectName}`);
+            deps.log(`使用指定的源码目录: ${projectName}`);
         }
-        logs.push('步骤 1: 同步 project.pbxproj 版本配置');
+        deps.log('步骤 1: 同步 project.pbxproj 版本配置');
         const projectPbxprojPath = deps.join(options.projectPath, projectFile, 'project.pbxproj');
         const pbxprojResult = safelyModifyProjectPbxproj(projectPbxprojPath, {
             bundleId: options.bundleId,
@@ -70,12 +69,12 @@ export async function buildIOSApp(options, deps) {
             writeFileSync: deps.writeFileSync
         });
         if (pbxprojResult.success) {
-            logs.push('project.pbxproj 版本配置同步完成');
+            deps.log('project.pbxproj 版本配置同步完成');
         }
         else {
-            logs.push(`project.pbxproj 版本配置同步失败: ${pbxprojResult.error}`);
+            deps.log(`project.pbxproj 版本配置同步失败: ${pbxprojResult.error}`);
         }
-        logs.push('步骤 2: 修改 Info.plist 配置');
+        deps.log('步骤 2: 修改 Info.plist 配置');
         const infoPlistPath = deps.join(options.projectPath, projectName, `${projectName}-Info.plist`);
         if (deps.existsSync(infoPlistPath)) {
             try {
@@ -125,20 +124,20 @@ export async function buildIOSApp(options, deps) {
                 const serializer = new deps.xmlSerializer();
                 const newXmlContent = serializer.serializeToString(xmlDoc);
                 deps.writeFileSync(infoPlistPath, newXmlContent, 'utf8');
-                logs.push('Info.plist 配置完成');
+                deps.log('Info.plist 配置完成');
                 if (options.enableIDFA) {
-                    logs.push('IDFA 配置完成');
+                    deps.log('IDFA 配置完成');
                 }
                 if (options.buildCustomBase) {
-                    logs.push('Application supports iTunes file sharing 配置完成');
+                    deps.log('Application supports iTunes file sharing 配置完成');
                 }
             }
             catch (error) {
-                logs.push(`配置 Info.plist 失败: ${error instanceof Error ? error.message : String(error)}`);
+                deps.log(`配置 Info.plist 失败: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
         if (options.permissions && options.permissions.length > 0) {
-            logs.push('步骤 2.1: 配置 iOS 权限');
+            deps.log('步骤 2.1: 配置 iOS 权限');
             const permissionsResult = await configureIOSPermissions(infoPlistPath, options.permissions, undefined, {
                 existsSync: deps.existsSync,
                 readFileSync: deps.readFileSync,
@@ -147,16 +146,16 @@ export async function buildIOSApp(options, deps) {
                 xmlSerializer: deps.xmlSerializer
             });
             if (permissionsResult.success) {
-                logs.push('iOS 权限配置完成');
-                logs.push(...permissionsResult.logs);
+                deps.log('iOS 权限配置完成');
+                permissionsResult.logs.forEach(msg => deps.log(msg));
             }
             else {
-                logs.push(`iOS 权限配置失败: ${permissionsResult.error}`);
-                logs.push(...permissionsResult.logs);
+                deps.log(`iOS 权限配置失败: ${permissionsResult.error}`);
+                permissionsResult.logs.forEach(msg => deps.log(msg));
             }
         }
         if (options.displayName) {
-            logs.push('步骤 2.2: 修改本地化字符串文件');
+            deps.log('步骤 2.2: 修改本地化字符串文件');
             const projectDir = deps.join(options.projectPath, projectName);
             const lprojDirs = ['en.lproj', 'zh-Hans.lproj', 'zh-Hant.lproj', 'Base.lproj', 'English.lproj'];
             for (const lprojDir of lprojDirs) {
@@ -172,18 +171,18 @@ export async function buildIOSApp(options, deps) {
                             content += `\nCFBundleDisplayName="${options.displayName}";\n`;
                         }
                         deps.writeFileSync(infoPlistStringsPath, content, 'utf8');
-                        logs.push(`已更新 ${lprojDir}/InfoPlist.strings`);
+                        deps.log(`已更新 ${lprojDir}/InfoPlist.strings`);
                     }
                     catch (error) {
-                        logs.push(`更新 ${lprojDir}/InfoPlist.strings 失败: ${error instanceof Error ? error.message : String(error)}`);
+                        deps.log(`更新 ${lprojDir}/InfoPlist.strings 失败: ${error instanceof Error ? error.message : String(error)}`);
                     }
                 }
             }
         }
         if (options.appIconPath) {
-            logs.push('步骤 2: 配置 App Icons Source');
+            deps.log('步骤 2: 配置 App Icons Source');
             if (!deps.sharp) {
-                logs.push('警告: 未提供 sharp 依赖，跳过图标配置。请安装 sharp 并在 deps 中传入。');
+                deps.log('警告: 未提供 sharp 依赖，跳过图标配置。请安装 sharp 并在 deps 中传入。');
             }
             else {
                 const appIconResult = await configureAppIconIOS(options.appIconPath, options.projectPath, projectName, {
@@ -196,19 +195,19 @@ export async function buildIOSApp(options, deps) {
                     sharp: deps.sharp
                 });
                 if (appIconResult.success) {
-                    logs.push('App Icons Source 配置完成');
-                    logs.push(...appIconResult.logs);
+                    deps.log('App Icons Source 配置完成');
+                    appIconResult.logs.forEach(msg => deps.log(msg));
                 }
                 else {
-                    logs.push(`App Icons Source 配置失败: ${appIconResult.error}`);
-                    logs.push(...appIconResult.logs);
+                    deps.log(`App Icons Source 配置失败: ${appIconResult.error}`);
+                    appIconResult.logs.forEach(msg => deps.log(msg));
                 }
             }
         }
         if (options.launchScreenPath) {
-            logs.push('步骤 3: 配置 LaunchScreen');
+            deps.log('步骤 3: 配置 LaunchScreen');
             if (!deps.sharp) {
-                logs.push('警告: 未提供 sharp 依赖，跳过启动屏配置。请安装 sharp 并在 deps 中传入。');
+                deps.log('警告: 未提供 sharp 依赖，跳过启动屏配置。请安装 sharp 并在 deps 中传入。');
             }
             else {
                 const launchScreenResult = await configureLaunchScreen(options.launchScreenPath, options.projectPath, projectName, {
@@ -221,17 +220,17 @@ export async function buildIOSApp(options, deps) {
                     sharp: deps.sharp
                 });
                 if (launchScreenResult.success) {
-                    logs.push('LaunchScreen 配置完成');
-                    logs.push(...launchScreenResult.logs);
+                    deps.log('LaunchScreen 配置完成');
+                    launchScreenResult.logs.forEach(msg => deps.log(msg));
                 }
                 else {
-                    logs.push(`LaunchScreen 配置失败: ${launchScreenResult.error}`);
-                    logs.push(...launchScreenResult.logs);
+                    deps.log(`LaunchScreen 配置失败: ${launchScreenResult.error}`);
+                    launchScreenResult.logs.forEach(msg => deps.log(msg));
                 }
             }
         }
         if (options.buildCustomBase) {
-            logs.push('步骤 4: 配置自定义基座（control.xml）');
+            deps.log('步骤 4: 配置自定义基座（control.xml）');
             const controlXmlPath = deps.join(options.projectPath, projectName, 'control.xml');
             if (deps.existsSync(controlXmlPath)) {
                 try {
@@ -254,37 +253,37 @@ export async function buildIOSApp(options, deps) {
                             const serializer = new deps.xmlSerializer();
                             const newXmlContent = serializer.serializeToString(xmlDoc);
                             deps.writeFileSync(controlXmlPath, newXmlContent, 'utf8');
-                            logs.push('control.xml 自定义基座配置完成：debug="true" syncDebug="true"');
+                            deps.log('control.xml 自定义基座配置完成：debug="true" syncDebug="true"');
                         }
                         else {
-                            logs.push('control.xml 自定义基座配置已存在，无需修改');
+                            deps.log('control.xml 自定义基座配置已存在，无需修改');
                         }
                     }
                     else {
-                        logs.push('警告：未找到 HBuilder 根节点，无法添加自定义基座配置');
+                        deps.log('警告：未找到 HBuilder 根节点，无法添加自定义基座配置');
                     }
                 }
                 catch (error) {
-                    logs.push(`配置 control.xml 失败: ${error instanceof Error ? error.message : String(error)}`);
+                    deps.log(`配置 control.xml 失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }
         }
-        logs.push('步骤 8: 编译 UniApp 项目并复制到 apps 目录');
+        deps.log('步骤 8: 编译 UniApp 项目并复制到 apps 目录');
         let sourcePath;
         if (options.uniappBuildOutputPath) {
-            logs.push('使用提供的 UniApp 编译结果路径');
+            deps.log('使用提供的 UniApp 编译结果路径');
             sourcePath = options.uniappBuildOutputPath;
             if (!deps.existsSync(sourcePath)) {
                 return {
                     success: false,
                     error: `提供的编译结果路径不存在: ${sourcePath}`,
-                    logs
+                    logs: []
                 };
             }
-            logs.push(`使用编译结果路径: ${sourcePath}`);
+            deps.log(`使用编译结果路径: ${sourcePath}`);
         }
         else {
-            logs.push('构建 UniApp 项目');
+            deps.log('构建 UniApp 项目');
             const buildDeps = {
                 exec: deps.exec,
                 join: deps.join,
@@ -296,10 +295,10 @@ export async function buildIOSApp(options, deps) {
                 return {
                     success: false,
                     error: `构建失败: ${uniBuildResult.error}`,
-                    logs: [...logs, ...uniBuildResult.logs]
+                    logs: []
                 };
             }
-            logs.push(...uniBuildResult.logs);
+            uniBuildResult.logs.forEach(msg => deps.log(msg));
             sourcePath = deps.join(options.uniappProjectPath, 'dist', 'build', 'app');
         }
         const targetPath = deps.join(options.projectPath, projectName, 'Pandora', 'apps', options.uniAppId, 'www');
@@ -309,13 +308,13 @@ export async function buildIOSApp(options, deps) {
                 deps.mkdirSync(targetDir, { recursive: true });
             }
             await deps.cp(sourcePath, targetPath, { recursive: true, force: true });
-            logs.push('应用资源复制完成');
+            deps.log('应用资源复制完成');
         }
         catch (error) {
             return {
                 success: false,
                 error: `复制应用资源失败: ${error instanceof Error ? error.message : String(error)}`,
-                logs
+                logs: []
             };
         }
         const controlXmlPath = deps.join(options.projectPath, projectName, 'control.xml');
@@ -341,13 +340,13 @@ export async function buildIOSApp(options, deps) {
                             if (options.appkey && appElement.getAttribute('appkey') !== options.appkey) {
                                 appElement.setAttribute('appkey', options.appkey);
                                 hasChanges = true;
-                                logs.push(`更新 appkey: ${options.appkey}`);
+                                deps.log(`更新 appkey: ${options.appkey}`);
                             }
                             if (hasChanges) {
-                                logs.push(`更新现有 app 元素，appid: ${options.uniAppId}`);
+                                deps.log(`更新现有 app 元素，appid: ${options.uniAppId}`);
                             }
                             else {
-                                logs.push(`app 元素已存在且配置正确，appid: ${options.uniAppId}`);
+                                deps.log(`app 元素已存在且配置正确，appid: ${options.uniAppId}`);
                             }
                             break;
                         }
@@ -356,41 +355,41 @@ export async function buildIOSApp(options, deps) {
                         while (existingAppElements.length > 0) {
                             appsElement.removeChild(existingAppElements[0]);
                         }
-                        logs.push('已删除所有现有的 app 元素');
+                        deps.log('已删除所有现有的 app 元素');
                         const newAppElement = xmlDoc.createElement('app');
                         newAppElement.setAttribute('appid', options.uniAppId);
                         newAppElement.setAttribute('appver', '');
                         if (options.appkey) {
                             newAppElement.setAttribute('appkey', options.appkey);
-                            logs.push(`设置 appkey: ${options.appkey}`);
+                            deps.log(`设置 appkey: ${options.appkey}`);
                         }
                         appsElement.appendChild(newAppElement);
-                        logs.push(`添加新的 app 元素，appid: ${options.uniAppId}`);
+                        deps.log(`添加新的 app 元素，appid: ${options.uniAppId}`);
                         hasChanges = true;
                     }
                     if (hasChanges || !appExists) {
                         const serializer = new deps.xmlSerializer();
                         const newXmlContent = serializer.serializeToString(xmlDoc);
                         deps.writeFileSync(controlXmlPath, newXmlContent, 'utf8');
-                        logs.push(`control.xml appid 配置完成，appid: ${options.uniAppId}`);
+                        deps.log(`control.xml appid 配置完成，appid: ${options.uniAppId}`);
                     }
                     else {
-                        logs.push(`control.xml appid 配置已存在，无需修改`);
+                        deps.log(`control.xml appid 配置已存在，无需修改`);
                     }
                 }
                 else {
-                    logs.push('control.xml 中未找到 apps 元素');
+                    deps.log('control.xml 中未找到 apps 元素');
                 }
             }
             catch (error) {
-                logs.push(`配置 control.xml appid 失败: ${error instanceof Error ? error.message : String(error)}`);
+                deps.log(`配置 control.xml appid 失败: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
         if (options.appkey && options.sourceDirectoryName) {
             const pluginInfoPlistPath = deps.join(options.projectPath, options.sourceDirectoryName, 'HBuilder-uniPlugin-Info.plist');
             if (deps.existsSync(pluginInfoPlistPath)) {
                 try {
-                    logs.push('配置插件项目 Info.plist (HBuilder-uniPlugin-Info.plist)');
+                    deps.log('配置插件项目 Info.plist (HBuilder-uniPlugin-Info.plist)');
                     const plistContent = deps.readFileSync(pluginInfoPlistPath, 'utf8');
                     const parser = new deps.xmlParser();
                     const xmlDoc = parser.parseFromString(plistContent, 'text/xml');
@@ -399,23 +398,23 @@ export async function buildIOSApp(options, deps) {
                         const serializer = new deps.xmlSerializer();
                         const newPlistContent = serializer.serializeToString(xmlDoc);
                         deps.writeFileSync(pluginInfoPlistPath, newPlistContent, 'utf8');
-                        logs.push(`HBuilder-uniPlugin-Info.plist dcloud_appkey 配置完成: ${options.appkey}`);
+                        deps.log(`HBuilder-uniPlugin-Info.plist dcloud_appkey 配置完成: ${options.appkey}`);
                     }
                     else {
-                        logs.push(`HBuilder-uniPlugin-Info.plist dcloud_appkey 配置失败（未找到或无法修改）`);
+                        deps.log(`HBuilder-uniPlugin-Info.plist dcloud_appkey 配置失败（未找到或无法修改）`);
                     }
                 }
                 catch (error) {
-                    logs.push(`配置 HBuilder-uniPlugin-Info.plist 失败: ${error instanceof Error ? error.message : String(error)}`);
+                    deps.log(`配置 HBuilder-uniPlugin-Info.plist 失败: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }
             else {
-                logs.push(`HBuilder-uniPlugin-Info.plist 文件不存在: ${pluginInfoPlistPath}`);
+                deps.log(`HBuilder-uniPlugin-Info.plist 文件不存在: ${pluginInfoPlistPath}`);
             }
         }
         const bundleId = options.bundleId || 'io.dcloud.HBuilder';
         if (options.wechatShare && bundleId) {
-            logs.push('集成微信分享模块');
+            deps.log('集成微信分享模块');
             const wechatShareResult = await integrateWechatShareIOS(options.projectPath, projectName, bundleId, {
                 appId: options.wechatShare.appId,
                 universalLinks: options.wechatShare.universalLinks,
@@ -439,16 +438,16 @@ export async function buildIOSApp(options, deps) {
                 xpath: deps.xpath
             });
             if (wechatShareResult.success) {
-                logs.push('微信分享模块集成完成');
-                logs.push(...wechatShareResult.logs);
+                deps.log('微信分享模块集成完成');
+                wechatShareResult.logs.forEach(msg => deps.log(msg));
             }
             else {
-                logs.push(`微信分享模块集成失败: ${wechatShareResult.error}`);
-                logs.push(...wechatShareResult.logs);
+                deps.log(`微信分享模块集成失败: ${wechatShareResult.error}`);
+                wechatShareResult.logs.forEach(msg => deps.log(msg));
             }
         }
         if (options.wechatOauth && bundleId) {
-            logs.push('集成微信登录模块');
+            deps.log('集成微信登录模块');
             const wechatOauthResult = await integrateWechatOauthIOS(options.projectPath, projectName, bundleId, {
                 appId: options.wechatOauth.appId,
                 universalLinks: options.wechatOauth.universalLinks,
@@ -472,16 +471,16 @@ export async function buildIOSApp(options, deps) {
                 xpath: deps.xpath
             });
             if (wechatOauthResult.success) {
-                logs.push('微信登录模块集成完成');
-                logs.push(...wechatOauthResult.logs);
+                deps.log('微信登录模块集成完成');
+                wechatOauthResult.logs.forEach(msg => deps.log(msg));
             }
             else {
-                logs.push(`微信登录模块集成失败: ${wechatOauthResult.error}`);
-                logs.push(...wechatOauthResult.logs);
+                deps.log(`微信登录模块集成失败: ${wechatOauthResult.error}`);
+                wechatOauthResult.logs.forEach(msg => deps.log(msg));
             }
         }
         if (options.qqShare && bundleId) {
-            logs.push('集成QQ分享模块');
+            deps.log('集成QQ分享模块');
             const qqShareResult = await integrateQQShareIOS(options.projectPath, projectName, bundleId, {
                 appId: options.qqShare.appId,
                 universalLinks: options.qqShare.universalLinks,
@@ -505,16 +504,16 @@ export async function buildIOSApp(options, deps) {
                 xpath: deps.xpath
             });
             if (qqShareResult.success) {
-                logs.push('QQ分享模块集成完成');
-                logs.push(...qqShareResult.logs);
+                deps.log('QQ分享模块集成完成');
+                qqShareResult.logs.forEach(msg => deps.log(msg));
             }
             else {
-                logs.push(`QQ分享模块集成失败: ${qqShareResult.error}`);
-                logs.push(...qqShareResult.logs);
+                deps.log(`QQ分享模块集成失败: ${qqShareResult.error}`);
+                qqShareResult.logs.forEach(msg => deps.log(msg));
             }
         }
         if (options.sinaShare && bundleId) {
-            logs.push('集成新浪微博分享模块');
+            deps.log('集成新浪微博分享模块');
             const sinaShareResult = await integrateSinaShareIOS(options.projectPath, projectName, bundleId, {
                 appKey: options.sinaShare.appKey,
                 appSecret: options.sinaShare.appSecret,
@@ -540,16 +539,16 @@ export async function buildIOSApp(options, deps) {
                 xpath: deps.xpath
             });
             if (sinaShareResult.success) {
-                logs.push('新浪微博分享模块集成完成');
-                logs.push(...sinaShareResult.logs);
+                deps.log('新浪微博分享模块集成完成');
+                sinaShareResult.logs.forEach(msg => deps.log(msg));
             }
             else {
-                logs.push(`新浪微博分享模块集成失败: ${sinaShareResult.error}`);
-                logs.push(...sinaShareResult.logs);
+                deps.log(`新浪微博分享模块集成失败: ${sinaShareResult.error}`);
+                sinaShareResult.logs.forEach(msg => deps.log(msg));
             }
         }
         if (options.nativePlugins && options.nativePlugins.length > 0) {
-            logs.push('集成 UniApp 原生插件');
+            deps.log('集成 UniApp 原生插件');
             for (const pluginConfig of options.nativePlugins) {
                 const pluginResult = await integrateNativePluginIOS(options.projectPath, projectName, pluginConfig.pluginPath, {
                     existsSync: deps.existsSync,
@@ -566,51 +565,59 @@ export async function buildIOSApp(options, deps) {
                     exec: deps.exec,
                     parse: deps.parse,
                     xmlParser: deps.xmlParser,
-                    xmlSerializer: deps.xmlSerializer
+                    xmlSerializer: deps.xmlSerializer,
+                    setTimeout: deps.setTimeout,
+                    clearTimeout: deps.clearTimeout,
+                    log: deps.log,
                 }, pluginConfig.parameters);
                 if (pluginResult.success) {
-                    logs.push(`原生插件集成完成: ${pluginConfig.pluginPath}`);
-                    logs.push(...pluginResult.logs);
+                    deps.log(`原生插件集成完成: ${pluginConfig.pluginPath}`);
+                    pluginResult.logs.forEach(msg => deps.log(msg));
                 }
                 else {
-                    logs.push(`原生插件集成失败: ${pluginResult.error}`);
-                    logs.push(...pluginResult.logs);
+                    deps.log(`原生插件集成失败: ${pluginResult.error}`);
+                    pluginResult.logs.forEach(msg => deps.log(msg));
                 }
             }
         }
-        logs.push('步骤 9: 编译 iOS 应用');
+        deps.log('步骤 9: 编译 iOS 应用');
         const configuration = options.configuration || 'Release';
         const scheme = options.scheme || projectName;
-        logs.push(`提示: 签名配置必须在 Xcode 中手动设置`);
-        logs.push(`提示: 请打开项目 ${projectFile}，在 Signing & Capabilities 中配置 Team`);
         if (options.signing?.teamId) {
-            logs.push(`提示: 开发团队 ID 应该是: ${options.signing.teamId}`);
+            deps.log(`签名配置: 开发团队 ID ${options.signing.teamId} 已自动配置到 project.pbxproj`);
         }
         const buildCommand = `cd "${options.projectPath}" && xcodebuild -project "${projectFile}" -scheme "${scheme}" -configuration "${configuration}" -destination "generic/platform=iOS" -allowProvisioningUpdates -archivePath "${deps.join(options.outputPath || options.projectPath, 'build', `${projectName}.xcarchive`)}" archive`;
         if (options.clean) {
-            logs.push('清理构建目录');
+            deps.log('清理构建目录');
             const cleanCommand = `cd "${options.projectPath}" && xcodebuild -project "${projectFile}" -scheme "${scheme}" -destination "generic/platform=iOS" clean`;
             await new Promise((resolve) => {
                 deps.exec(cleanCommand, (error, stdout, stderr) => {
                     if (error) {
-                        logs.push(`清理警告: ${error.message}`);
+                        deps.log(`清理警告: ${error.message}`);
                     }
                     if (stdout)
-                        logs.push(`清理输出: ${stdout}`);
+                        deps.log(`清理输出: ${stdout}`);
                     resolve();
                 });
             });
         }
-        logs.push(`执行构建命令: ${buildCommand}`);
+        deps.log(`执行构建命令: ${buildCommand}`);
+        deps.log(`提示: iOS 构建可能需要较长时间，请耐心等待...`);
+        deps.log(`提示: 如果超过 10 分钟没有输出，构建可能会被取消`);
+        let resolved = false;
         const buildResult = await new Promise((resolve) => {
             const child = deps.exec(buildCommand, (error, stdout, stderr) => {
+                if (resolved)
+                    return;
+                resolved = true;
+                deps.clearTimeout(timeout);
                 const allOutput = stdout + (stderr ? '\n' + stderr : '');
                 if (error) {
-                    logs.push(`构建错误: ${error.message}`);
+                    deps.log(`构建错误: ${error.message}`);
                     if (stdout)
-                        logs.push(`标准输出:\n${stdout}`);
+                        deps.log(`标准输出:\n${stdout}`);
                     if (stderr)
-                        logs.push(`错误输出:\n${stderr}`);
+                        deps.log(`错误输出:\n${stderr}`);
                     const errorDetails = allOutput.includes('error:')
                         ? allOutput.split('error:').slice(1).join('error:').split('\n').slice(0, 5).join('\n')
                         : (stderr || stdout || error.message);
@@ -622,14 +629,18 @@ export async function buildIOSApp(options, deps) {
                     return;
                 }
                 if (stdout)
-                    logs.push(`构建输出:\n${stdout}`);
+                    deps.log(`构建输出:\n${stdout}`);
                 if (stderr)
-                    logs.push(`警告信息:\n${stderr}`);
+                    deps.log(`警告信息:\n${stderr}`);
                 resolve({ success: true });
             });
-            deps.setTimeout(() => {
+            const timeout = deps.setTimeout(() => {
+                if (resolved)
+                    return;
+                resolved = true;
+                deps.log(`警告: 构建超时（10分钟），正在终止进程...`);
                 child.kill();
-                resolve({ success: false, error: '构建超时' });
+                resolve({ success: false, error: '构建超时（10分钟）' });
             }, 600000);
         });
         if (!buildResult.success) {
@@ -639,7 +650,7 @@ export async function buildIOSApp(options, deps) {
             return {
                 success: false,
                 error: errorMessage,
-                logs
+                logs: []
             };
         }
         const shouldExportIPA = options.exportIPA !== false;
@@ -647,29 +658,29 @@ export async function buildIOSApp(options, deps) {
         const archivePath = deps.join(buildBasePath, `${projectName}.xcarchive`);
         if (!deps.existsSync(archivePath)) {
             const errorMessage = `Archive 文件不存在: ${archivePath}`;
-            logs.push(errorMessage);
+            deps.log(errorMessage);
             return {
                 success: false,
                 error: errorMessage,
-                logs
+                logs: []
             };
         }
-        logs.push(`Archive 文件已找到: ${archivePath}`);
+        deps.log(`Archive 文件已找到: ${archivePath}`);
         if (!shouldExportIPA) {
-            logs.push('iOS 插件项目编译完成（跳过 IPA 导出）');
-            logs.push(`Archive 文件: ${archivePath}`);
-            logs.push('\n💡 提示: 插件开发构建已完成，可以在 Xcode 中运行项目进行调试');
-            logs.push('💡 如需导出 IPA，请设置 exportIPA: true');
+            deps.log('iOS 插件项目编译完成（跳过 IPA 导出）');
+            deps.log(`Archive 文件: ${archivePath}`);
+            deps.log('\n💡 提示: 插件开发构建已完成，可以在 Xcode 中运行项目进行调试');
+            deps.log('💡 如需导出 IPA，请设置 exportIPA: true');
             return {
                 success: true,
                 outputPath: archivePath,
-                logs
+                logs: []
             };
         }
         const exportBasePath = deps.join(buildBasePath, 'export');
         if (!deps.existsSync(exportBasePath)) {
             deps.mkdirSync(exportBasePath, { recursive: true });
-            logs.push(`创建导出目录: ${exportBasePath}`);
+            deps.log(`创建导出目录: ${exportBasePath}`);
         }
         const exportOptionsPlistPath = deps.join(exportBasePath, 'ExportOptions.plist');
         const method = 'development';
@@ -694,30 +705,30 @@ export async function buildIOSApp(options, deps) {
         deps.writeFileSync(exportOptionsPlistPath, exportOptionsPlistContent, 'utf8');
         if (!deps.existsSync(exportOptionsPlistPath)) {
             const errorMessage = `ExportOptions.plist 文件创建失败: ${exportOptionsPlistPath}`;
-            logs.push(errorMessage);
+            deps.log(errorMessage);
             return {
                 success: false,
                 error: errorMessage,
-                logs
+                logs: []
             };
         }
-        logs.push(`ExportOptions.plist 文件已创建: ${exportOptionsPlistPath}`);
-        logs.push('开始导出 IPA');
-        logs.push(`Archive 路径: ${archivePath}`);
-        logs.push(`导出路径: ${exportBasePath}`);
-        logs.push(`ExportOptions.plist 路径: ${exportOptionsPlistPath}`);
-        logs.push(`ExportOptions.plist 内容:\n${exportOptionsPlistContent}`);
+        deps.log(`ExportOptions.plist 文件已创建: ${exportOptionsPlistPath}`);
+        deps.log('开始导出 IPA');
+        deps.log(`Archive 路径: ${archivePath}`);
+        deps.log(`导出路径: ${exportBasePath}`);
+        deps.log(`ExportOptions.plist 路径: ${exportOptionsPlistPath}`);
+        deps.log(`ExportOptions.plist 内容:\n${exportOptionsPlistContent}`);
         const exportCommand = `xcodebuild -exportArchive -archivePath "${archivePath}" -exportPath "${exportBasePath}" -exportOptionsPlist "${exportOptionsPlistPath}"`;
-        logs.push(`执行导出命令: ${exportCommand}`);
-        logs.push('注意：如果导出失败，请检查上面的日志输出，特别是 "导出标准输出" 和 "导出错误/警告输出" 部分');
+        deps.log(`执行导出命令: ${exportCommand}`);
+        deps.log('注意：如果导出失败，请检查上面的日志输出，特别是 "导出标准输出" 和 "导出错误/警告输出" 部分');
         const exportResult = await new Promise((resolve) => {
             const child = deps.exec(exportCommand, (error, stdout, stderr) => {
                 const allOutput = stdout + (stderr ? '\n' + stderr : '');
                 if (stdout) {
-                    logs.push(`导出标准输出:\n${stdout}`);
+                    deps.log(`导出标准输出:\n${stdout}`);
                 }
                 if (stderr) {
-                    logs.push(`导出错误/警告输出:\n${stderr}`);
+                    deps.log(`导出错误/警告输出:\n${stderr}`);
                 }
                 const hasError = allOutput.toLowerCase().includes('error:') ||
                     allOutput.toLowerCase().includes('failed') ||
@@ -726,7 +737,7 @@ export async function buildIOSApp(options, deps) {
                     allOutput.toLowerCase().includes('export succeeded') ||
                     allOutput.toLowerCase().includes('exportarchive succeeded');
                 if (error) {
-                    logs.push(`导出命令执行错误: ${error.message}`);
+                    deps.log(`导出命令执行错误: ${error.message}`);
                     const errorDetails = hasError
                         ? allOutput.split(/error:/i).slice(1).join('error:').split('\n').slice(0, 10).join('\n')
                         : (stderr || stdout || error.message);
@@ -747,15 +758,15 @@ export async function buildIOSApp(options, deps) {
                     return;
                 }
                 if (hasSuccess) {
-                    logs.push('导出命令执行成功（检测到成功标志）');
+                    deps.log('导出命令执行成功（检测到成功标志）');
                     resolve({ success: true });
                 }
                 else if (!hasError && allOutput.trim().length > 0) {
-                    logs.push('导出命令执行完成（未检测到错误，假设成功）');
+                    deps.log('导出命令执行完成（未检测到错误，假设成功）');
                     resolve({ success: true });
                 }
                 else if (!hasError) {
-                    logs.push('导出命令执行完成（无错误无输出，假设成功）');
+                    deps.log('导出命令执行完成（无错误无输出，假设成功）');
                     resolve({ success: true });
                 }
                 else {
@@ -778,17 +789,17 @@ export async function buildIOSApp(options, deps) {
             return {
                 success: false,
                 error: errorMessage,
-                logs
+                logs: []
             };
         }
         let ipaPath;
         try {
             if (deps.existsSync(exportBasePath)) {
                 const topLevelFiles = deps.readdirSync(exportBasePath);
-                logs.push(`导出目录内容: ${topLevelFiles.join(', ')}`);
+                deps.log(`导出目录内容: ${topLevelFiles.join(', ')}`);
             }
             else {
-                logs.push(`警告: 导出目录不存在: ${exportBasePath}`);
+                deps.log(`警告: 导出目录不存在: ${exportBasePath}`);
             }
             const findIpaFile = (dir, depth = 0) => {
                 if (depth > 3) {
@@ -798,11 +809,11 @@ export async function buildIOSApp(options, deps) {
                     return undefined;
                 }
                 const files = deps.readdirSync(dir);
-                logs.push(`搜索目录 (深度 ${depth}): ${dir}, 文件数: ${files.length}`);
+                deps.log(`搜索目录 (深度 ${depth}): ${dir}, 文件数: ${files.length}`);
                 const ipaFile = files.find(f => f.toLowerCase().endsWith('.ipa'));
                 if (ipaFile) {
                     const foundPath = deps.join(dir, ipaFile);
-                    logs.push(`找到 IPA 文件: ${foundPath}`);
+                    deps.log(`找到 IPA 文件: ${foundPath}`);
                     return foundPath;
                 }
                 for (const file of files) {
@@ -825,7 +836,7 @@ export async function buildIOSApp(options, deps) {
             ipaPath = findIpaFile(exportBasePath);
         }
         catch (error) {
-            logs.push(`查找 IPA 文件时出错: ${error instanceof Error ? error.message : String(error)}`);
+            deps.log(`查找 IPA 文件时出错: ${error instanceof Error ? error.message : String(error)}`);
         }
         if (!ipaPath) {
             const listDirectory = (dir, prefix = '') => {
@@ -859,22 +870,22 @@ export async function buildIOSApp(options, deps) {
             };
             const dirStructure = listDirectory(exportBasePath);
             const errorMessage = `导出成功但未找到 IPA 文件，导出路径: ${exportBasePath}`;
-            logs.push(errorMessage);
-            logs.push('导出目录结构:');
-            logs.push(...dirStructure);
-            logs.push('请检查 xcodebuild 导出日志，确认是否有错误');
+            deps.log(errorMessage);
+            deps.log('导出目录结构:');
+            dirStructure.forEach(msg => deps.log(msg));
+            deps.log('请检查 xcodebuild 导出日志，确认是否有错误');
             return {
                 success: false,
                 error: errorMessage,
-                logs
+                logs: []
             };
         }
-        logs.push('iOS 离线打包完成');
-        logs.push(`IPA 文件已生成: ${ipaPath}`);
+        deps.log('iOS 离线打包完成');
+        deps.log(`IPA 文件已生成: ${ipaPath}`);
         return {
             success: true,
             outputPath: ipaPath,
-            logs
+            logs: []
         };
     }
     catch (error) {
@@ -882,7 +893,7 @@ export async function buildIOSApp(options, deps) {
         return {
             success: false,
             error: `打包过程中发生异常: ${errorMessage}`,
-            logs
+            logs: []
         };
     }
 }