pindo 5.17.4 → 5.18.3

data/lib/pindo/command/utils/renewcert.rb

@@ -83,8 +83,8 @@ module Pindo
 
                 fixed_bundleid_array.each do |bundle_id|
                     # begin
-                        if bundle_id.eql?("com.heroneverdie101.*")
-                            bundle_id = "com.heroneverdie101"
+                        if bundle_id.include?("*")
+                            bundle_id = bundle_id.gsub(".*", "")
                         end
                       fixed_cert(bundle_id:bundle_id, renew_flag:@renew_cert_flag, upload_flag:@upload_flag, fixed_bundleid_flag:@fixedid_flag)
                     # rescue => err
@@ -123,58 +123,60 @@ module Pindo
                     )
                 end
 
-                if @fast_flag
-
-                    if @dev_bundle_id_array.include?(bundle_id) || @tool_bundle_id_array.include?(bundle_id)
-                        args_temp = []
-                        args_temp << "--config=#{config_file_path}"
-                        args_temp << "--build_type=dev"
-                        if renew_flag
-                            args_temp << "--renew"
-                        end
-                        if upload_flag
-                            args_temp << "--upload"
-                        end
-                        Pindo::Command::Appstore::Cert::run(args_temp)
-                    end
-
-                    if @deploy_bundle_id_array.include?(bundle_id)
-                        args_temp = []
-                        args_temp << "--config=#{config_file_path}"
-                        args_temp << "--build_type=adhoc"
-                        if renew_flag
-                            args_temp << "--renew"
-                        end
-                        if upload_flag
-                            args_temp << "--upload"
-                        end
-                        Pindo::Command::Appstore::Cert::run(args_temp)
-                    end
-
-                else
-
-                    args_temp = []
-                    args_temp << "--config=#{config_file_path}"
-                    args_temp << "--build_type=dev"
-                    if renew_flag
-                        args_temp << "--renew"
-                    end
-                    if upload_flag
-                        args_temp << "--upload"
-                    end
-                    Pindo::Command::Appstore::Cert::run(args_temp)
-
-                    args_temp = []
-                    args_temp << "--config=#{config_file_path}"
-                    args_temp << "--build_type=adhoc"
-                    if renew_flag
-                        args_temp << "--renew"
-                    end
-                    if upload_flag
-                        args_temp << "--upload"
-                    end
-                    Pindo::Command::Appstore::Cert::run(args_temp)
-                end
+                Pindo::Command::Appstore::Bundleid::run([])
+
+                # if @fast_flag
+
+                #     if @dev_bundle_id_array.include?(bundle_id) || @tool_bundle_id_array.include?(bundle_id)
+                #         args_temp = []
+                #         args_temp << "--config=#{config_file_path}"
+                #         args_temp << "--build_type=dev"
+                #         if renew_flag
+                #             args_temp << "--renew"
+                #         end
+                #         if upload_flag
+                #             args_temp << "--upload"
+                #         end
+                #         Pindo::Command::Appstore::Cert::run(args_temp)
+                #     end
+
+                #     if @deploy_bundle_id_array.include?(bundle_id)
+                #         args_temp = []
+                #         args_temp << "--config=#{config_file_path}"
+                #         args_temp << "--build_type=adhoc"
+                #         if renew_flag
+                #             args_temp << "--renew"
+                #         end
+                #         if upload_flag
+                #             args_temp << "--upload"
+                #         end
+                #         Pindo::Command::Appstore::Cert::run(args_temp)
+                #     end
+
+                # else
+
+                #     args_temp = []
+                #     args_temp << "--config=#{config_file_path}"
+                #     args_temp << "--build_type=dev"
+                #     if renew_flag
+                #         args_temp << "--renew"
+                #     end
+                #     if upload_flag
+                #         args_temp << "--upload"
+                #     end
+                #     Pindo::Command::Appstore::Cert::run(args_temp)
+
+                #     args_temp = []
+                #     args_temp << "--config=#{config_file_path}"
+                #     args_temp << "--build_type=adhoc"
+                #     if renew_flag
+                #         args_temp << "--renew"
+                #     end
+                #     if upload_flag
+                #         args_temp << "--upload"
+                #     end
+                #     Pindo::Command::Appstore::Cert::run(args_temp)
+                # end
             end
 
 

data/lib/pindo/command/utils.rb

@@ -7,6 +7,9 @@ require 'pindo/command/utils/device'
 # require 'pindo/command/utils/tgate'
 # require 'pindo/command/utils/boss'
 require 'pindo/command/utils/renewcert'
+require 'pindo/command/utils/renewbundleid'
+require 'pindo/command/utils/copyconfig'
+require 'pindo/command/utils/allcopyconfig'
 require 'pindo/command/utils/repoinit'
 require 'pindo/command/utils/tag'
 require 'pindo/command/utils/updateconfig'

data/lib/pindo/command/web/autobuild.rb

@@ -155,7 +155,7 @@ module Pindo
                     pindo_project_dir = Dir.pwd
 
                     # 加载 JPS 配置（如果存在）
-                    Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir)
+                    Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir, conf: @args_conf)
 
                     # 准备配置
                     config = prepare_web_config(pindo_project_dir)
@@ -270,12 +270,14 @@ module Pindo
                     )
                     tasks << git_commit_task
 
-                    # 2. Git 标签任务（总是创建，依赖提交任务，在 Unity 导出之前创建）
-                    # 所有参数都从 GitCommitTask 获取
-                    git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
-                    git_tag_task.dependencies << git_commit_task.id
-                    tasks << git_tag_task
-                    last_task = git_tag_task
+                    # 2. Git 标签任务（skip_without_tag 模式下不创建）
+                    git_tag_task = nil
+                    unless process_type == Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG
+                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
+                        git_tag_task.dependencies << git_commit_task.id
+                        tasks << git_tag_task
+                        last_task = git_tag_task
+                    end
 
                     # 3. Unity 更新必备库任务（可选）
                     unless @args_skip_lib
@@ -417,7 +419,7 @@ module Pindo
                       )
                       # 依赖 Git Commit、Git Tag 和 Bind Package 任务
                       workflow_message_task.dependencies << git_commit_task.id
-                      workflow_message_task.dependencies << git_tag_task.id
+                      workflow_message_task.dependencies << git_tag_task.id if git_tag_task
                       workflow_message_task.dependencies << bind_package_task.id
                       tasks << workflow_message_task
                     end

data/lib/pindo/config/build_info_manager.rb

@@ -174,9 +174,7 @@ module Pindo
       end
     end
 
-    private
-
-    # 修改仓库设置（测试环境）
+    # 将仓库注册到 git_base_url.json，指定其所属 org
     def modify_repo_setting(repo_name:, owner_org:)
       pindo_setting_dir = pindo_single_config.pindo_env_configdir
       git_repo_file = pindo_single_config.git_base_url_fullname

data/lib/pindo/module/android/android_build_helper.rb

@@ -4,6 +4,7 @@ require_relative 'gradle_helper'
 require_relative 'gp_compliance_helper'
 require_relative 'java_env_helper'
 require_relative 'keystore_helper'
+require_relative 'workflow_gradle_injector'
 require 'fileutils'
 
 module Pindo
@@ -19,7 +20,7 @@ module Pindo
     end
     
 
-    def auto_build_apk(project_dir, debug = false, ignore_sub = false)
+    def auto_build_apk(project_dir, debug = false, ignore_sub = false, bundle_name: nil, workflow_name: nil)
       raise ArgumentError, "项目目录不能为空" if project_dir.nil?
       raise ArgumentError, "项目目录不存在" unless File.directory?(project_dir)
 
@@ -40,10 +41,16 @@ module Pindo
       # 2. 处理 Unity 作为 lib 的原生工程（Unity 放在 Unity 目录下）
       elsif Pindo::AndroidProjectHelper.unity_as_lib_android_project?(project_dir)
         puts "处理 Unity 作为 lib 的原生工程..."
+
+        # 确保主工程能继承 Unity 导出的关键 gradle.properties 配置
+        # 包括 android.aapt2FromMavenOverride 与 org.gradle.java.home
+        Pindo::AndroidProjectHelper.sync_gradle_properties_from_unity_to_main(project_dir)
+
         unity_dir = File.join(project_dir, "Unity")
 
         if File.directory?(unity_dir)
           puts "找到 Unity 模块目录: Unity/"
+          validate_unity_libs_state!(unity_dir, stage: "导出前")
 
           # 如果 Unity 子目录是完整的 Unity 导出工程，对其进行处理
           if Pindo::AndroidProjectHelper.unity_android_project?(unity_dir)
@@ -67,6 +74,7 @@ module Pindo
               raise RuntimeError, "编译 Unity 模块 SO 库失败"
             end
             copy_so_files(unity_dir, project_dir)
+            validate_unity_libs_state!(project_dir, stage: "导出后")
 
             # SO 库拷贝完成后，重新配置主工程的 Java Home 和 Gradle 环境
             puts "Unity SO库编译完成，切换到主工程编译环境"
@@ -89,26 +97,44 @@ module Pindo
       # 检查并配置 local.properties（所有项目类型都需要）
       Pindo::AndroidProjectHelper.check_main_local_properties(project_dir)
 
-      # 配置 Keystore 签名
+      # 配置 Keystore 签名（从 JPS 获取，alias_name 为 Application ID）
       build_type = debug ? "debug" : "release"
-      if Pindo::KeystoreHelper.apply_keystore_config(project_dir, build_type)
-        puts "✓ Keystore 签名配置成功"
+      raise "bundle_name 不能为空，Keystore 签名需要 Application ID" if bundle_name.nil? || bundle_name.empty?
+
+      unless Pindo::KeystoreHelper.apply_keystore_config(project_dir, build_type, bundle_id: bundle_name)
+        raise RuntimeError, "Keystore 签名配置失败"
+      end
+      puts "✓ Android 签名配置成功"
+
+      if workflow_name && !workflow_name.to_s.empty?
+        injector = Pindo::Android::WorkflowGradleInjector.new
+        ctx = injector.prepare!(
+          project_dir: project_dir,
+          workflow_name: workflow_name,
+          enable_pad: true
+        )
+        apk_path = nil
+        begin
+          apk_path = build_apk(project_dir, debug, workflow_build_type: ctx[:workflow_build_type])
+        ensure
+          injector.cleanup!(ctx)
+        end
+        # JKS 仅在 universal.apk 已成功产出后删除；失败则保留，便于排查（Gradle 注入已在 ensure 中恢复）
+        Pindo::KeystoreHelper.cleanup_managed_signing_paths! if apk_path && File.exist?(apk_path.to_s)
+        Pindo::Android::WorkflowGradleInjector.remove_project_pindo_tmp_dir!(project_dir)
       else
-        puts "⚠ Keystore 签名配置跳过（使用工程原有配置）"
+        # 兼容旧行为：仍会永久写入 PAD 相关变更（如需临时恢复，请传 workflow_name 走注入管线）
+        setup_play_asset_delivery(project_dir)
+        apk_path = build_apk(project_dir, debug)
+        Pindo::KeystoreHelper.cleanup_managed_signing_paths! if apk_path && File.exist?(apk_path.to_s)
       end
-
-      # 处理 Play Asset Delivery 配置（如果存在）
-      setup_play_asset_delivery(project_dir)
-
-      # 构建 APK
-      build_apk(project_dir, debug)
     end
 
-    def build_apk(project_path, debug)
+    def build_apk(project_path, debug, workflow_build_type: nil)
       raise ArgumentError, "项目路径不能为空" if project_path.nil? || project_path.empty?
 
       # 构建 AAB 文件
-      unless build_aab(project_path, debug)
+      unless build_aab(project_path, debug, workflow_build_type: workflow_build_type)
         raise RuntimeError, "AAB 构建失败"
       end
 
@@ -116,7 +142,11 @@ module Pindo
       main_module = Pindo::AndroidProjectHelper.get_main_module(project_path)
       raise ArgumentError, "无法找到主模块" unless main_module
 
-      keystore_config = Pindo::KeystoreHelper.get_keystore_config_from_project(project_path, debug)
+      keystore_config = Pindo::KeystoreHelper.get_keystore_config_from_project(
+        project_path,
+        debug,
+        workflow_build_type: workflow_build_type
+      )
       raise ArgumentError, "无法从 build.gradle 中获取 keystore 信息" unless keystore_config
 
       build_tools = Pindo::AndroidProjectHelper.get_build_tools
@@ -132,7 +162,11 @@ module Pindo
       end
 
       # 准备输出路径
-      build_type = debug ? 'debug' : 'release'
+      build_type = if workflow_build_type && !workflow_build_type.to_s.empty?
+                     workflow_build_type.to_s
+                   else
+                     debug ? 'debug' : 'release'
+                   end
       main_module_name = File.basename(main_module)
       output_dir = File.join(project_path, "build/apks")
 
@@ -176,14 +210,37 @@ module Pindo
       # --- END ---
 
       # puts "解析 keystore 配置"
-      ks = keystore_config[:store_file]
-      # puts "读取 keystore path = #{ks}"
-      ks_pass = keystore_config[:store_password]
-      # puts "读取 keystore pass = #{ks_pass}"
-      key_alias = keystore_config[:key_alias]
-      # puts "读取 key alias = #{key_alias}"
-      key_pass = keystore_config[:key_password]
-      # puts "读取 key pass = #{key_pass}"
+      # 与 Gradle 对 storeFile 的生效顺序一致：常见写法为
+      #   storeFile file(System.getenv("RELEASE_KEYSTORE_PATH") ?: "signing/gxdebug.jks")
+      # apply_keystore_config 已在当前进程设置 RELEASE_*，Gradle 打 AAB 时走 ENV 指向的真实 jks；
+      # get_keystore_config_from_project 若只解析到 ?: 右侧占位路径，会与 AAB 实际签名不一致且文件可能不存在。
+      # 故：当 RELEASE_KEYSTORE_PATH 展开后文件存在时，bundletool 必须使用同一套 RELEASE_*（非「失败回退」）。
+      kh = Pindo::KeystoreHelper
+      env_ks = ENV[kh::ENV_RELEASE_KEYSTORE_PATH]
+      env_ks_abs = env_ks && !env_ks.to_s.empty? ? File.expand_path(env_ks) : nil
+      gradle_ks = keystore_config[:store_file]
+
+      use_release_env = env_ks_abs && File.exist?(env_ks_abs)
+      if use_release_env
+        ks = env_ks_abs
+        ks_pass = ENV[kh::ENV_RELEASE_KEYSTORE_PASSWORD] || keystore_config[:store_password]
+        key_alias = ENV[kh::ENV_RELEASE_KEY_ALIAS] || keystore_config[:key_alias]
+        key_pass = ENV[kh::ENV_RELEASE_KEY_PASSWORD] || keystore_config[:key_password]
+      else
+        ks = gradle_ks || env_ks
+        ks = File.expand_path(ks.to_s) if ks && !ks.to_s.empty?
+        ks_pass = keystore_config[:store_password] || ENV[kh::ENV_RELEASE_KEYSTORE_PASSWORD]
+        key_alias = keystore_config[:key_alias] || ENV[kh::ENV_RELEASE_KEY_ALIAS]
+        key_pass = keystore_config[:key_password] || ENV[kh::ENV_RELEASE_KEY_PASSWORD]
+      end
+
+      ks_display = ks && !ks.to_s.empty? ? File.expand_path(ks.to_s) : ks.to_s
+      # puts "[bundletool] universal.apk 实际使用的签名 keystore: #{ks_display}"
+      # if workflow_build_type && !workflow_build_type.to_s.empty?
+      #   puts "[bundletool] workflow buildType: #{workflow_build_type}"
+      # end
+      # puts "[bundletool] 签名来源: #{use_release_env ? "RELEASE_KEYSTORE_PATH（文件存在，与 Gradle 打 AAB 一致）" : "build.gradle 解析 / ENV 兜底（非 RELEASE 路径或文件不存在时）"}"
+      # puts "[bundletool] keyAlias: #{key_alias.inspect}（口令不落日志）"
 
       # 构建 APK
       # 确保使用正确的 Java 版本 (Java 11+)
@@ -212,8 +269,12 @@ module Pindo
         raise RuntimeError, "AAB 文件不存在: #{paths[:bundle]}"
       end
 
+      if ks.nil? || ks.to_s.empty?
+        raise RuntimeError, "Keystore 路径为空：无法从 build.gradle 解析签名配置，且未从环境变量获取到 #{Pindo::KeystoreHelper::ENV_RELEASE_KEYSTORE_PATH}"
+      end
+
       unless File.exist?(ks)
-        raise RuntimeError, "Keystore 文件不存在"
+        raise RuntimeError, "Keystore 文件不存在: #{ks}"
       end
 
       unless system(*bundletool_cmd)
@@ -238,12 +299,85 @@ module Pindo
       paths[:universal_apk]
     end
 
-    def build_aab(project_path, debug)
+    def build_aab(project_path, debug, workflow_build_type: nil)
       # 使用子 Shell 切换目录执行，避免影响主进程当前目录 (Thread Safe)
-      cmd = "cd \"#{project_path}\" && ./gradlew bundle#{debug ? 'Debug' : 'Release'}"
+      # --no-daemon：签名依赖当前进程注入的 RELEASE_* 环境变量；已存在的 Gradle Daemon
+      # 继承的是其首次启动时的环境，会看不到 pindo 刚设置的变量，从而回退到 build.gradle 里 ?: 的本地 jks。
+      main_module = Pindo::AndroidProjectHelper.get_main_module(project_path)
+      module_name = main_module ? File.basename(main_module) : nil
+      prefix = module_name && !module_name.empty? ? ":#{module_name}:" : ""
+
+      task_name = if workflow_build_type && !workflow_build_type.to_s.empty?
+                    "bundle#{workflow_build_type.to_s[0].upcase}#{workflow_build_type.to_s[1..]}"
+                  else
+                    debug ? "bundleDebug" : "bundleRelease"
+                  end
+
+      bundle_task = "#{prefix}#{task_name}"
+      skip_clean = ENV['PINDO_SKIP_GRADLE_CLEAN'] == '1'
+      # 任意 bundle 变体（含 debug）均先 clean，避免 aabresguard 等任务因残留输出报「文件已存在」；本地加速可设 PINDO_SKIP_GRADLE_CLEAN=1
+      puts '  AAB 构建前先执行 Gradle clean（环境变量 PINDO_SKIP_GRADLE_CLEAN=1 可跳过）' unless skip_clean
+      puts '  已跳过 Gradle clean（PINDO_SKIP_GRADLE_CLEAN=1）' if skip_clean
+
+      gradle_clean_resilient!(project_path) unless skip_clean
+
+      cmd = "cd \"#{project_path}\" && ./gradlew --no-daemon #{bundle_task}"
       system(cmd)
     end
 
+    # clean 失败（占用、.DS_Store 竞态等）时：停 Daemon → 再删 .DS_Store → 物理删除各模块 build/，与 Gradle clean 产物一致，不中断后续 bundle
+    private def gradle_clean_resilient!(project_path)
+      prune_ds_store_before_gradle_clean!(project_path)
+      cmd = %(cd "#{project_path}" && ./gradlew --no-daemon clean)
+      return if system(cmd)
+
+      puts '  ⚠ Gradle clean 失败，正在自动恢复：--stop、清理 .DS_Store、删除各模块 build/ ...'
+      system(%(cd "#{project_path}" && ./gradlew --stop), out: File::NULL, err: File::NULL)
+      sleep 0.3
+      prune_ds_store_before_gradle_clean!(project_path)
+      remove_android_module_build_dirs!(project_path)
+    end
+
+    # 删除 Gradle 模块产物目录（与 clean 目标一致：根 build、一级子模块/build、常见二级子模块/build）
+    private def remove_android_module_build_dirs!(project_path)
+      return unless project_path && File.directory?(project_path)
+
+      paths = []
+      root_build = File.join(project_path, 'build')
+      paths << root_build if File.directory?(root_build)
+
+      Dir.each_child(project_path) do |name|
+        next if name.start_with?('.')
+
+        mod_build = File.join(project_path, name, 'build')
+        paths << mod_build if File.directory?(mod_build)
+
+        sub = File.join(project_path, name)
+        next unless File.directory?(sub)
+
+        Dir.each_child(sub) do |subname|
+          next if subname.start_with?('.')
+
+          nested = File.join(sub, subname, 'build')
+          paths << nested if File.directory?(nested)
+        end
+      end
+
+      paths.uniq.each do |p|
+        FileUtils.rm_rf(p)
+      end
+    rescue StandardError => e
+      puts "  ⚠ 物理删除 build 目录时出现异常（将继续尝试 bundle）: #{e.message}"
+    end
+
+    # macOS 在 clean 遍历删除 build 目录时 Finder 可能写入 .DS_Store，Gradle 会报 Unable to delete / New files were found
+    private def prune_ds_store_before_gradle_clean!(project_path)
+      return unless project_path && File.directory?(project_path)
+
+      system('find', project_path, '-name', '.DS_Store', '-type', 'f', '-delete',
+             out: File::NULL, err: File::NULL)
+    end
+
     def build_so_library(project_path)
       # 编译so库 (Thread Safe)
       cmd = "cd \"#{project_path}\" && ./gradlew unityLibrary:BuildIl2CppTask"
@@ -282,24 +416,55 @@ module Pindo
 
     # 递归合并拷贝：将源目录的内容合并到目标目录
     def copy_merge_recursive(src_dir, dst_dir)
-      # 获取源目录中的所有文件和子目录
-      Dir.glob(File.join(src_dir, "{*,.*}")).each do |src_item|
-        # 跳过 . 和 ..
-        next if File.basename(src_item) == '.' || File.basename(src_item) == '..'
-
-        dst_item = File.join(dst_dir, File.basename(src_item))
+      Dir.each_child(src_dir) do |name|
+        src_item = File.join(src_dir, name)
+        dst_item = File.join(dst_dir, name)
 
         if File.directory?(src_item)
           # 如果是目录，确保目标子目录存在，然后递归拷贝
           FileUtils.mkdir_p(dst_item)
           copy_merge_recursive(src_item, dst_item)
         else
-          # 如果是文件，直接覆盖（Unity 编译的文件应该覆盖旧的）
+          # Unity/EDM 常在 libs 下放置指向解析缓存的符号链接；BuildIl2CppTask 后可能出现断裂链接，
+          # FileUtils.cp 跟随链接会导致 No such file or directory。
+          unless File.exist?(src_item)
+            puts "  ⚠ 跳过缺失或断裂的引用: #{name}"
+            next
+          end
+
           FileUtils.cp(src_item, dst_item)
         end
       end
     end
 
+    def validate_unity_libs_state!(android_root, stage:)
+      # 某些项目会将 unityLibrary 作为缓存/中间产物纳入仓库，但 libs 下的 .aar -> .srcaar
+      # 符号链接目标是由 EDM4U/导出过程生成，初次拉取代码时可能为断链。
+      # 默认仍严格失败；如确有需要，可通过环境变量临时跳过此校验继续构建。
+      return if ENV["PINDO_SKIP_UNITY_LIBS_VALIDATE"] == "1"
+
+      libs_dir = File.join(android_root, "unityLibrary", "libs")
+      return unless File.directory?(libs_dir)
+
+      broken_links = []
+      Dir.each_child(libs_dir) do |name|
+        file_path = File.join(libs_dir, name)
+        next unless File.symlink?(file_path)
+        next if File.exist?(file_path)
+
+        broken_links << "#{name} -> #{File.readlink(file_path)}"
+      end
+
+      return if broken_links.empty?
+
+      raise RuntimeError, <<~MSG
+        Unity 依赖校验失败（#{stage}）：发现失效的符号链接，请先在 Unity 中执行 EDM4U Resolve 后重新导出。
+        扫描目录: #{libs_dir}
+        失效条目:
+        - #{broken_links.join("\n- ")}
+      MSG
+    end
+
     # 设置 Play Asset Delivery：直接扫描导出工程中的资源目录，按照 Android 原生方式创建 .androidpack 目录
     # 仅适用于 Unity 项目，对于原生 Android 项目会静默跳过
     def setup_play_asset_delivery(project_dir)