pindo 5.6.6 → 5.7.0

data/lib/pindo/module/build/buildhelper.rb

@@ -60,6 +60,8 @@ module Pindo
 
           # 定义要添加的gitignore规则数组
           ignore_rules = [
+            'Temp',
+            'Logs',
             'build_ios.log',
             'feishu.json',
             'CHANGELOG.md',

data/lib/pindo/module/build/unityhelper.rb

@@ -216,37 +216,11 @@ module Pindo
 
         puts "Unity command: #{cmd_args.join(' ')}"
         puts ""
-        puts "\e[33m正在执行 Unity 构建，这可能需要几分钟时间，请耐心等待...\e[0m"
         
         # 根据平台显示不同的构建步骤
         platform = additional_args[:platform]
-        if platform == 'Android'
-          puts "\e[36m提示: Unity 正在后台处理项目，包括以下步骤:\e[0m"
-          puts "\e[36m  • 编译 C# 脚本\e[0m"
-          puts "\e[36m  • 处理资源文件\e[0m"
-          puts "\e[36m  • 生成 Android 项目\e[0m"
-          puts "\e[36m  • 构建 AAB 文件\e[0m"
-        elsif platform == 'iOS'
-          puts "\e[36m提示: Unity 正在后台处理项目，包括以下步骤:\e[0m"
-          puts "\e[36m  • 编译 C# 脚本\e[0m"
-          puts "\e[36m  • 处理资源文件\e[0m"
-          puts "\e[36m  • 生成 iOS 项目\e[0m"
-          puts "\e[36m  • 构建 Xcode 项目\e[0m"
-        elsif platform == 'WebGL'
-          puts "\e[36m提示: Unity 正在后台处理项目，包括以下步骤:\e[0m"
-          puts "\e[36m  • 编译 C# 脚本\e[0m"
-          puts "\e[36m  • 处理资源文件\e[0m"
-          puts "\e[36m  • 生成 WebGL 项目\e[0m"
-          puts "\e[36m  • 构建 Web 资源\e[0m"
-        else
-          puts "\e[36m提示: Unity 正在后台处理项目，包括以下步骤:\e[0m"
-          puts "\e[36m  • 编译 C# 脚本\e[0m"
-          puts "\e[36m  • 处理资源文件\e[0m"
-          puts "\e[36m  • 生成项目文件\e[0m"
-        end
+        puts "\e[33m正在执行 Unity 构建(#{platform} 平台)，这可能需要几分钟时间，长时间无响应请完全终止当前终端后重试\e[0m"
         
-        puts "\e[36m如果长时间无响应（Unity 进程可能已卡死），请完全终止当前终端后重试\e[0m"
-        puts "\e[36m或者，打开 Unity Editor 通过构建工具执行一次项目导出后，关闭 Unity Editor 再执行此命令\e[0m"
         puts ""
         
         # 使用更智能的进度检测机制
@@ -324,15 +298,6 @@ module Pindo
                 end
               end
 
-              # 检查是否长时间无输出（可能卡死）
-              if Time.now - last_output_time > 300 # 5分钟无输出
-                puts "\n\e[33m⚠️  Unity 构建已超过5分钟无输出，可能遇到问题\e[0m"
-                puts "\e[33m建议：\e[0m"
-                puts "\e[33m  1. 检查 Unity Editor 是否有弹窗需要确认\e[0m"
-                puts "\e[33m  2. 查看 Unity 日志文件\e[0m"
-                puts "\e[33m  3. 如确认卡死，可按 Ctrl+C 终止构建\e[0m"
-                last_output_time = Time.now # 重置计时器
-              end
             end
             
             # 读取剩余输出

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -50,7 +50,161 @@ module Pindo
             return @has_login
         end
 
-        def prepare_upload(working_directory:nil, proj_name:nil)
+        # 尝试从 JPSBuildConfig.json 加载配置
+        #
+        # @param working_directory [String] 工作目录
+        # @param package_type [String] 包类型 ("ipa" | "apk" | "zip")
+        # @return [Hash] 结果哈希
+        #   - valid [Boolean] 配置是否完全有效
+        #   - project_name [String] 项目名称
+        #   - project_id [String] 项目ID
+        #   - workflow_info [Hash] 工作流信息（如果有效）
+        def try_load_jps_build_config(working_directory:, package_type:)
+          result = {
+            valid: false,
+            project_name: nil,
+            project_id: nil,
+            workflow_info: nil
+          }
+
+          # 1. 确定配置文件路径
+          config_file = determine_config_file_path(working_directory)
+
+          unless File.exist?(config_file)
+            puts "[JPSConfig] 配置文件不存在" if ENV['DEBUG']
+            return result
+          end
+
+          # 2. 读取并解析配置
+          begin
+            config = JSON.parse(File.read(config_file))
+          rescue => e
+            puts "[JPSConfig] 配置文件解析失败: #{e.message}"
+            return result
+          end
+
+          # 3. 提取项目信息
+          result[:project_name] = config['project_name']
+          result[:project_id] = config['project_id']
+
+          # 4. 验证项目ID
+          if result[:project_id].nil? || result[:project_id].to_s.empty?
+            puts "[JPSConfig] 项目ID为空" if ENV['DEBUG']
+            return result
+          end
+
+          # 5. 确定 workflow_key
+          workflow_key = case package_type
+            when 'ipa' then 'ipa_workflow'
+            when 'apk' then 'apk_workflow'
+            when 'zip' then 'webgl_workflow'
+            else
+              puts "[JPSConfig] 不支持的 package_type: #{package_type}"
+              return result
+          end
+
+          # 6. 验证工作流配置
+          workflow = config[workflow_key]
+
+          unless workflow_valid?(workflow)
+            puts "[JPSConfig] #{workflow_key} 配置无效或不完整" if ENV['DEBUG']
+            return result
+          end
+
+          # 7. 所有验证通过
+          result[:valid] = true
+          result[:workflow_info] = {
+            workflow_id: workflow['workflow_id'],
+            tab_name: workflow['tab_name'],
+            package_name: workflow['package_name'],
+            package_type: workflow['package_type'],
+            manage_type: workflow['manage_type'] || ""
+          }
+
+          puts "[JPSConfig] 配置验证通过" if ENV['DEBUG']
+          return result
+        end
+
+        # 为项目选择工作流
+        #
+        # @param project_id [String] 项目ID
+        # @param package_type [String] 包类型
+        # @param working_directory [String] 工作目录
+        # @return [Hash] 选择的工作流信息
+        def select_workflow_for_project(project_id:, package_type:, working_directory:)
+          # 1. 从 JPS API 获取可用工作流列表
+          Funlog.instance.fancyinfo_start("正在获取可用工作流...")
+
+          workflow_result = @pgyer_client.get_project_workflows(project_id: project_id)
+
+          if workflow_result.nil? || workflow_result['data'].nil?
+            raise Informative, "获取工作流列表失败"
+          end
+
+          workflows = workflow_result['data']
+
+          if workflows.empty?
+            raise Informative, "该项目没有可用的工作流"
+          end
+
+          Funlog.instance.fancyinfo_success("获取工作流列表成功，共 #{workflows.size} 个工作流")
+
+          # 2. 根据 package_type 过滤工作流（如果 API 返回的数据中有 packageType 字段）
+          filtered_workflows = workflows.select do |w|
+            # 如果工作流有 packageType 字段，进行过滤
+            if w['packageType']
+              case package_type
+              when 'ipa'
+                w['packageType'] == 'ipa'
+              when 'apk'
+                w['packageType'] == 'apk'
+              when 'zip'
+                w['packageType'] == 'zip'
+              else
+                true
+              end
+            else
+              # 如果没有 packageType 字段，显示所有工作流
+              true
+            end
+          end
+
+          # 如果过滤后没有结果，使用所有工作流
+          display_workflows = filtered_workflows.empty? ? workflows : filtered_workflows
+
+          # 3. 用户选择工作流
+          type_desc = case package_type
+            when 'ipa' then 'iOS IPA'
+            when 'apk' then 'Android APK'
+            when 'zip' then 'WebGL'
+            else package_type
+          end
+
+          cli = HighLine.new
+          workflow_choices = display_workflows.map do |w|
+            "#{w['tabName'] || w['tab_name']} (ID: #{w['id'] || w['workflow_id']})"
+          end
+
+          selected = cli.choose do |menu|
+            menu.prompt = "请选择 #{type_desc} 工作流:"
+            menu.choices(*workflow_choices)
+          end
+
+          # 4. 提取选择的工作流
+          selected_index = workflow_choices.index(selected)
+          workflow = display_workflows[selected_index]
+
+          # 5. 返回标准化的工作流信息
+          {
+            workflow_id: workflow['id'] || workflow['workflow_id'],
+            tab_name: workflow['tabName'] || workflow['tab_name'],
+            package_name: workflow['packageName'] || workflow['package_name'] || workflow['tabName'] || workflow['tab_name'],
+            package_type: package_type,
+            manage_type: workflow['manageType'] || workflow['manage_type'] || ""
+          }
+        end
+
+        def prepare_upload(working_directory:nil, proj_name:nil, package_type:nil)
             upload_proj_name = proj_name
             if upload_proj_name.nil? || upload_proj_name.empty?
                 upload_proj_name = @proj_name
@@ -64,6 +218,40 @@ module Pindo
                 puts
             end
 
+            # 【核心优化】尝试从 JPSBuildConfig.json 加载配置
+            if package_type
+              config_result = try_load_jps_build_config(
+                working_directory: working_directory,
+                package_type: package_type
+              )
+
+              if config_result[:valid]
+                # 配置有效，直接使用
+                puts "\n使用 JPSBuildConfig.json 配置:"
+                puts "  项目: #{config_result[:project_name]}"
+                puts "  工作流: #{config_result[:workflow_info][:tab_name]}"
+
+                # 确保已登录
+                unless login
+                  raise Informative, "请先登录JPS网站"
+                end
+
+                # 获取完整的 app_info_obj
+                app_info_obj = find_app_info_with_obj_list(
+                  proj_name: config_result[:project_name]
+                )
+
+                if app_info_obj
+                  @proj_name = config_result[:project_name]
+                  return app_info_obj, config_result[:workflow_info]
+                else
+                  puts "配置的项目不存在，将重新选择"
+                end
+              end
+            end
+
+            # ===== 配置无效或不存在，进入用户选择流程 =====
+
             app_info_obj = nil
             if login
 
@@ -78,7 +266,28 @@ module Pindo
                         context = Pindo::PindoContext.instance
                         context.set_selection(Pindo::PindoContext::SelectionKey::PROJECT_NAME, upload_proj_name)
                     end
-                    return app_info_obj
+
+                    # 如果提供了 package_type，选择工作流并保存配置
+                    if package_type
+                      workflow_info = select_workflow_for_project(
+                        project_id: app_info_obj["id"],
+                        package_type: package_type,
+                        working_directory: working_directory
+                      )
+
+                      save_jps_build_config(
+                        working_directory: working_directory,
+                        app_info_obj: app_info_obj,
+                        workflow_info: workflow_info,
+                        package_type: package_type
+                      )
+
+                      @proj_name = upload_proj_name
+                      return app_info_obj, workflow_info
+                    else
+                      @proj_name = upload_proj_name
+                      return app_info_obj
+                    end
                 end
 
                 proj_name_array = []
@@ -137,7 +346,7 @@ module Pindo
                         # 直接使用缓存的选择，跳过后续选择逻辑
                     end
 
-                    
+
                 end
 
                 # 只有在没有缓存或缓存无效，且没有环境变量时才显示选择菜单
@@ -178,8 +387,24 @@ module Pindo
                     # 记录上次上传的项目
                     PindoUserLocalConfig.instance.write_last_work_project(proj_name:app_info_obj["projectName"])
 
-                    # 保存项目信息到 JPSBuildConfig.json
-                    save_jps_build_config(working_directory: working_directory, app_info_obj: app_info_obj)
+                    # 如果提供了 package_type，选择工作流并保存配置
+                    if package_type
+                      workflow_info = select_workflow_for_project(
+                        project_id: app_info_obj["id"],
+                        package_type: package_type,
+                        working_directory: working_directory
+                      )
+
+                      save_jps_build_config(
+                        working_directory: working_directory,
+                        app_info_obj: app_info_obj,
+                        workflow_info: workflow_info,
+                        package_type: package_type
+                      )
+
+                      @proj_name = upload_proj_name
+                      return app_info_obj, workflow_info
+                    end
                 end
 
 
@@ -869,76 +1094,145 @@ module Pindo
 
         private
 
-        # 保存项目信息到 JPSBuildConfig.json
-        # Unity 工程：保存到仓库根目录的 ProjectSettings/JPSBuildConfig.json
-        # 其他工程：保存到仓库根目录的 JPSBuildConfig.json
-        def save_jps_build_config(working_directory: nil, app_info_obj: nil)
-            return if working_directory.nil? || app_info_obj.nil?
-
-            # 获取 Git 仓库根目录
-            repo_root_dir = nil
-            if is_git_directory?(local_repo_dir: working_directory)
-                repo_root_dir = git_root_directory(local_repo_dir: working_directory)
-            end
-
-            # 如果不是 Git 仓库，使用 working_directory
-            repo_root_dir ||= working_directory
-
-            # 判断工程类型并确定配置文件路径
-            # Unity 工程：仓库根目录/ProjectSettings/JPSBuildConfig.json
-            # iOS/Android 工程：仓库根目录/JPSBuildConfig.json
-            config_file = nil
-            project_type = nil
-
-            # 检查是否是 Unity 工程（仓库根目录存在 ProjectSettings 目录）
-            if File.directory?(File.join(repo_root_dir, 'ProjectSettings'))
-                config_file = File.join(repo_root_dir, 'ProjectSettings', 'JPSBuildConfig.json')
-                project_type = 'Unity'
-            else
-                # iOS/Android 工程，保存到仓库根目录
-                config_file = File.join(repo_root_dir, 'JPSBuildConfig.json')
-                project_type = 'iOS/Android'
-            end
+        # 确定 JPSBuildConfig.json 文件路径
+        # Unity 工程：仓库根目录/ProjectSettings/JPSBuildConfig.json
+        # iOS/Android 工程：仓库根目录/JPSBuildConfig.json
+        #
+        # @param working_directory [String] 工作目录
+        # @return [String] 配置文件完整路径
+        def determine_config_file_path(working_directory)
+          # 获取 Git 仓库根目录
+          repo_root_dir = nil
+          if is_git_directory?(local_repo_dir: working_directory)
+            repo_root_dir = git_root_directory(local_repo_dir: working_directory)
+          end
+          repo_root_dir ||= working_directory
+
+          # 判断工程类型
+          if File.directory?(File.join(repo_root_dir, 'ProjectSettings'))
+            File.join(repo_root_dir, 'ProjectSettings', 'JPSBuildConfig.json')
+          else
+            File.join(repo_root_dir, 'JPSBuildConfig.json')
+          end
+        end
 
-            # 准备要保存的数据
-            new_config = {
-                "project_name" => app_info_obj["projectName"],
-                "project_scheme" => app_info_obj["scheme"] || app_info_obj["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, ''),
-                "project_id" => app_info_obj["id"]
-            }
+        # 验证工作流配置是否有效
+        #
+        # @param workflow [Hash] 工作流配置对象
+        # @return [Boolean] 是否有效
+        def workflow_valid?(workflow)
+          return false if workflow.nil?
+          return false if workflow['workflow_id'].nil? || workflow['workflow_id'].to_s.empty?
+          return false if workflow['package_name'].nil? || workflow['package_name'].empty?
+          true
+        end
 
-            # 检查文件是否已存在
-            if File.exist?(config_file)
-                begin
-                    # 读取现有配置
-                    existing_content = File.read(config_file)
-                    existing_config = JSON.parse(existing_content)
-
-                    # 如果 project_name 一样，则不需要重新保存
-                    if existing_config['project_name'] == new_config['project_name']
-                        puts "[PgyerHelper] JPSBuildConfig.json 项目名称未变化，跳过保存 (#{project_type})" if ENV['DEBUG']
-                        return
-                    end
-                rescue => e
-                    puts "[PgyerHelper] 读取现有 JPSBuildConfig.json 失败: #{e.message}" if ENV['DEBUG']
-                    # 继续保存新配置
-                end
-            else
-                # 文件不存在，需要创建目录（如果是 Unity 工程）
-                if project_type == 'Unity'
-                    project_settings_dir = File.join(working_directory, 'ProjectSettings')
-                    FileUtils.mkdir_p(project_settings_dir) unless File.directory?(project_settings_dir)
-                end
-            end
+        # 创建新的 JPSBuildConfig.json 配置文件
+        #
+        # @param config_file [String] 配置文件路径
+        # @param project_id [String] 项目ID
+        # @param project_name [String] 项目名称
+        # @param project_scheme [String] 项目scheme
+        # @param workflow_key [String] 工作流键名
+        # @param workflow_data [Hash] 工作流数据
+        def create_new_config(config_file, project_id, project_name, project_scheme, workflow_key, workflow_data)
+          new_config = {
+            "project_name" => project_name,
+            "project_scheme" => project_scheme,
+            "project_id" => project_id,
+            workflow_key => workflow_data
+          }
+
+          # 确保目录存在
+          config_dir = File.dirname(config_file)
+          FileUtils.mkdir_p(config_dir) unless File.directory?(config_dir)
+
+          File.write(config_file, JSON.pretty_generate(new_config))
+          puts "已创建 JPSBuildConfig.json"
+        end
 
-            # 保存配置到文件
-            begin
-                File.write(config_file, JSON.pretty_generate(new_config))
-                puts "[PgyerHelper] 已保存项目信息到 JPSBuildConfig.json (#{project_type})" if ENV['DEBUG']
-                puts "项目信息已保存: #{new_config['project_name']}"
-            rescue => e
-                puts "[PgyerHelper] 保存 JPSBuildConfig.json 失败: #{e.message}"
-            end
+        # 保存项目信息到 JPSBuildConfig.json
+        # 支持新的工作流格式，根据 project_id 和 workflow_id 判断是否需要更新
+        #
+        # @param working_directory [String] 工作目录
+        # @param app_info_obj [Hash] 项目信息对象
+        # @param workflow_info [Hash] 工作流信息
+        # @param package_type [String] 包类型 ("ipa" | "apk" | "zip")
+        def save_jps_build_config(working_directory:, app_info_obj:, workflow_info:, package_type:)
+          return if working_directory.nil? || app_info_obj.nil? || workflow_info.nil? || package_type.nil?
+
+          # 1. 确定配置文件路径
+          config_file = determine_config_file_path(working_directory)
+
+          # 2. 确定 workflow_key
+          workflow_key = case package_type
+            when 'ipa' then 'ipa_workflow'
+            when 'apk' then 'apk_workflow'
+            when 'zip' then 'webgl_workflow'
+            else raise Informative, "不支持的 package_type: #{package_type}"
+          end
+
+          # 3. 准备新的项目基础信息
+          new_project_id = app_info_obj["id"]
+          new_project_name = app_info_obj["projectName"]
+          new_project_scheme = app_info_obj["scheme"] ||
+                               app_info_obj["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, '')
+
+          # 4. 准备新的工作流信息
+          new_workflow_data = {
+            "workflow_id" => workflow_info[:workflow_id],
+            "tab_name" => workflow_info[:tab_name],
+            "package_type" => package_type,
+            "package_name" => workflow_info[:package_name],
+            "manage_type" => workflow_info[:manage_type] || ""
+          }
+
+          # 5. 配置文件不存在 → 创建新配置
+          if !File.exist?(config_file)
+            create_new_config(config_file, new_project_id, new_project_name,
+                              new_project_scheme, workflow_key, new_workflow_data)
+            return
+          end
+
+          # 6. 读取现有配置
+          begin
+            existing_config = JSON.parse(File.read(config_file))
+          rescue => e
+            puts "[PgyerHelper] 读取配置文件失败: #{e.message}，将创建新配置"
+            create_new_config(config_file, new_project_id, new_project_name,
+                              new_project_scheme, workflow_key, new_workflow_data)
+            return
+          end
+
+          # 7. Project ID 变更 → 重写整个配置
+          if existing_config['project_id'].nil? ||
+             existing_config['project_id'].to_s.empty? ||
+             existing_config['project_id'] != new_project_id
+
+            puts "项目ID变更，重新写入完整配置"
+            create_new_config(config_file, new_project_id, new_project_name,
+                              new_project_scheme, workflow_key, new_workflow_data)
+            return
+          end
+
+          # 8. Project ID 不变，检查工作流是否需要更新
+          existing_workflow = existing_config[workflow_key]
+          existing_workflow_id = existing_workflow&.dig('workflow_id')
+
+          if existing_workflow_id.nil? ||
+             existing_workflow_id.to_s.empty? ||
+             existing_workflow_id != workflow_info[:workflow_id]
+
+            # Workflow ID 变更 → 仅更新对应的 workflow
+            puts "#{workflow_key} 变更，更新工作流配置"
+            existing_config[workflow_key] = new_workflow_data
+            File.write(config_file, JSON.pretty_generate(existing_config))
+            puts "已更新 #{workflow_key}"
+            return
+          end
+
+          # 9. Project ID 和 Workflow ID 都不变 → 不修改
+          puts "配置未变更，跳过保存" if ENV['DEBUG']
         end
     end