pindo 5.11.3 → 5.12.1

data/lib/pindo/module/task/model/unity_export_task.rb

@@ -1,4 +1,5 @@
 require_relative '../pindo_task'
+require 'pindo/base/funlog'
 
 module Pindo
   module TaskSystem
@@ -9,21 +10,27 @@ module Pindo
         :unity_export
       end
 
-      def self.execution_mode
-        ExecutionMode::EXCLUSIVE  # Unity 必须独占执行
+      # 重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED 
       end
 
-      def self.execution_type
-        ExecutionType::SYNC  # 在主线程同步执行（Unity 不能多进程）
+      def self.default_retry_count
+        2  # 可以重试 2 次
+      end
+
+      def self.default_retry_delay
+        10  # 延迟 10 秒
       end
 
       def initialize(platform, options = {})
         @platform = platform
         @unity_project_path = options[:project_path] || Dir.pwd
-        @unity_exe_path = options[:unity_exe_path]
-        @unity_helper = options[:unity_helper]
-        @is_library_mode = options[:library_mode] || false
-        @export_path = nil
+        @unity_exe_path = nil  # 将在 do_work 中自动查找
+        @unity_helper = nil    # 将在 do_work 中自动初始化
+        @is_library_mode = false  # 不再支持库模式
+        @index_count = options[:context] ? options[:context][:index_count] : nil
+        @export_path = options[:export_path]  # 可由参数传入，nil 表示自动检测
 
         name = case platform
                when 'ios', 'ipa'
@@ -56,18 +63,14 @@ module Pindo
       protected
 
       def do_work
-        update_progress(0, "启动 Unity...")
-
         # 确保 Unity helper 已初始化
         @unity_helper ||= Pindo::Client::UnityHelper.share_instance
 
         # 获取 Unity 版本
-        update_progress(10, "检查 Unity 版本...")
         project_unity_version = @unity_helper.get_unity_version(@unity_project_path)
 
         # 查找 Unity 执行路径
         unless @unity_exe_path
-          update_progress(20, "查找 Unity 路径...")
           @unity_exe_path = @unity_helper.find_unity_path(
             project_unity_version: project_unity_version,
             force_change_version: false
@@ -78,11 +81,9 @@ module Pindo
           raise "无法找到 Unity 执行路径"
         end
 
-        update_progress(30, "准备 Unity 导出...")
-
         # 显示 Unity 信息
-        puts "  Unity 版本: #{project_unity_version}"
-        puts "  Unity 路径: #{@unity_exe_path}"
+        Funlog.info("Unity 版本: #{project_unity_version}")
+        Funlog.info("Unity 路径: #{@unity_exe_path}")
 
         # 执行 Unity 导出
         case @platform
@@ -100,17 +101,26 @@ module Pindo
       private
 
       def export_ios
-        update_progress(40, "执行 Unity iOS 导出...")
-
         platform = 'iOS'
-        result = execute_unity_build(platform)
 
-        update_progress(90, "Unity iOS 导出完成")
+        # 设置导出路径（如果未指定）
+        if @export_path.nil?
+          # 优先使用 BaseiOS，如果不存在则使用 iOS
+          base_ios_path = File.join(@unity_project_path, "GoodPlatform", "BaseiOS")
+          ios_path = File.join(@unity_project_path, "GoodPlatform", "iOS")
+
+          @export_path = if File.exist?(base_ios_path)
+                           base_ios_path
+                         else
+                           ios_path
+                         end
+        end
+
+        # 根据导出路径判断是否为库模式
+        @is_library_mode = @export_path.include?("BaseiOS")
 
-        # 设置导出路径
-        @export_path = File.join(@unity_project_path, "GoodPlatform", "iOS")
+        result = execute_unity_build(platform)
 
-        update_progress(100, "Unity iOS 导出成功")
         {
           success: true,
           platform: 'ios',
@@ -120,17 +130,26 @@ module Pindo
       end
 
       def export_android
-        update_progress(40, "执行 Unity Android 导出...")
-
         platform = 'Android'
-        result = execute_unity_build(platform)
 
-        update_progress(90, "Unity Android 导出完成")
+        # 设置导出路径（如果未指定）
+        if @export_path.nil?
+          # 优先使用 BaseAndroid，如果不存在则使用 Android
+          base_android_path = File.join(@unity_project_path, "GoodPlatform", "BaseAndroid")
+          android_path = File.join(@unity_project_path, "GoodPlatform", "Android")
+
+          @export_path = if File.exist?(base_android_path)
+                           base_android_path
+                         else
+                           android_path
+                         end
+        end
+
+        # 根据导出路径判断是否为库模式
+        @is_library_mode = @export_path.include?("BaseAndroid")
 
-        # 设置导出路径
-        @export_path = File.join(@unity_project_path, "GoodPlatform", "Android")
+        result = execute_unity_build(platform)
 
-        update_progress(100, "Unity Android 导出成功")
         {
           success: true,
           platform: 'android',
@@ -140,17 +159,13 @@ module Pindo
       end
 
       def export_web
-        update_progress(40, "执行 Unity WebGL 导出...")
-
         platform = 'WebGL'
         result = execute_unity_build(platform)
 
-        update_progress(90, "Unity WebGL 导出完成")
-
-        # 设置导出路径
-        @export_path = File.join(@unity_project_path, "GoodPlatform", "Web")
+        # 设置导出路径（如果未指定）
+        # Web 平台只有一个目录
+        @export_path ||= File.join(@unity_project_path, "GoodPlatform", "WebGL")
 
-        update_progress(100, "Unity WebGL 导出成功")
         {
           success: true,
           platform: 'web',
@@ -161,25 +176,22 @@ module Pindo
 
       def execute_unity_build(platform)
         # 检查 Unity 进程
-        update_progress(50, "检查 Unity 进程...")
         @unity_helper.check_unity_processes(
           unity_exe_full_path: @unity_exe_path,
           project_path: @unity_project_path
         )
 
         # 执行构建
-        update_progress(60, "开始 Unity 构建...")
         begin
           result = @unity_helper.build_project(
             unity_exe_full_path: @unity_exe_path,
             project_path: @unity_project_path,
             platform: platform,
             isLibrary: @is_library_mode,
-            indexNo: nil
+            indexNo: @index_count
           )
 
           # 清理 Unity 进程
-          update_progress(85, "清理 Unity 进程...")
           @unity_helper.cleanup_unity_processes_after_build(
             unity_exe_full_path: @unity_exe_path,
             project_path: @unity_project_path

data/lib/pindo/module/task/model/upload_task.rb

@@ -1,278 +1,219 @@
 require_relative '../pindo_task'
+require_relative '../task_config'
+require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo
   module TaskSystem
+    # 上传任务
+    # 上传构建产物到测试平台（JPS）
     class UploadTask < PindoTask
-      attr_reader :platform, :file_path, :upload_url
+      attr_reader :file_type, :upload_path, :upload_file
 
       def self.task_type
         :upload
       end
 
-      def self.execution_mode
-        ExecutionMode::CONCURRENT  # 上传可以并发执行
+      # 重试配置
+      def self.default_retry_mode
+        RetryMode::DELAYED  # 延迟重试
       end
 
-      def self.execution_type
-        ExecutionType::ASYNC  # 在新线程异步执行
+      def self.default_retry_count
+        3  # 默认可以重试 3 次
       end
 
-      def initialize(platform, file_path, options = {})
-        @platform = platform
-        @file_path = file_path
+      def self.default_retry_delay
+        10  # 默认延迟 10 秒
+      end
+
+      # 初始化上传任务
+      # @param file_type [String] 文件类型：'ipa' | 'apk' | 'html' | 'app'
+      # @param upload_path [String] 搜索文件的路径
+      # @param upload_file [String] 要上传的文件（nil 表示自动查找）
+      # @param options [Hash] 选项
+      # @option options [Hash] :app_info_obj JPS 应用信息对象（可选，如为 nil 则延迟获取）
+      # @option options [Hash] :workflow_info 工作流信息（可选，如为 nil 则延迟获取）
+      # @option options [String] :project_name 项目名称（可选）
+      def initialize(file_type, upload_path, upload_file, options = {})
+        @file_type = file_type        # 'ipa' | 'apk' | 'html' | 'app'
+        @upload_path = upload_path    # 搜索文件的路径
+        @upload_file = upload_file    # 要上传的文件（nil 表示自动查找）
+
+        # 可选参数（如果为 nil，在 do_work 中延迟获取）
+        @app_info_obj = options[:app_info_obj]
+        @workflow_info = options[:workflow_info]
         @project_name = options[:project_name]
-        @upload_helper = options[:upload_helper]
-        @upload_url = nil
 
-        name = case platform
-               when 'ios', 'ipa'
+        # 设置上传任务的优先级为 LOW，确保在构建任务之后执行
+        options[:priority] ||= TaskPriority::LOW
+
+        name = case file_type
+               when 'ipa'
                  "上传 IPA"
-               when 'android', 'apk'
+               when 'apk'
                  "上传 APK"
-               when 'web', 'html'
-                 "上传 HTML"
+               when 'html'
+                 "上传 WebGL"
+               when 'app'
+                 "上传 macOS App"
                else
-                 "上传 #{platform.upcase}"
+                 "上传 #{file_type.upcase}"
                end
 
         super(name, options)
       end
 
       def validate
-        # 如果文件路径为空，暂时跳过验证（可能从构建任务结果获取）
-        return true if @file_path.nil?
+        # 验证基本参数
+        unless @file_type && !@file_type.empty?
+          @error = "缺少必需参数: file_type"
+          return false
+        end
 
-        # 验证文件是否存在
-        unless File.exist?(@file_path)
-          @error = "上传文件不存在：#{@file_path}"
+        unless @upload_path && !@upload_path.empty?
+          @error = "缺少必需参数: upload_path"
           return false
         end
 
+        # upload_path 可能在构建任务执行后才创建，这里不验证是否存在
+        # 实际文件查找会在 do_work 中进行
+
+        # app_info_obj 和 workflow_info 可以延迟获取，不在这里验证
+
         true
       end
 
       protected
 
       def do_work
-        # 如果文件路径为空，尝试从 context 获取
-        if @file_path.nil?
-          @file_path = @context[:output_path]
-        end
-
-        # 再次验证文件
-        unless @file_path && File.exist?(@file_path)
-          raise "上传文件不存在或未指定：#{@file_path}"
-        end
-
-        update_progress(0, "准备上传...")
-
-        # 初始化上传 helper
-        @upload_helper ||= PgyerHelper.share_instace
-
-        case @platform
-        when 'ios', 'ipa'
-          upload_ipa
-        when 'android', 'apk'
-          upload_apk
-        when 'web', 'html'
-          upload_web
+        # 1. 确定上传文件
+        if @upload_file && !@upload_file.empty? && File.exist?(@upload_file)
+          # 使用指定文件
+          file_to_upload = @upload_file
+          puts "  使用指定文件: #{file_to_upload}"
         else
-          raise "Unsupported platform: #{@platform}"
-        end
-      end
-
-      private
-
-      def upload_ipa
-        update_progress(10, "准备上传 IPA...")
-
-        # 获取文件大小
-        file_size = File.size(@file_path) / (1024.0 * 1024.0)
-        update_progress(20, "文件大小: #{file_size.round(2)} MB")
-
-        # 准备上传参数
-        upload_params = prepare_upload_params
-
-        update_progress(30, "开始上传到测试平台...")
-
-        # 执行上传
-        begin
-          # 模拟进度更新
-          upload_with_progress do |progress|
-            update_progress(30 + (progress * 0.6).to_i, "上传中...")
+          # 在 upload_path 下查找 file_type 类型的最新文件
+          file_to_upload = find_latest_file_by_type
+          unless file_to_upload && File.exist?(file_to_upload)
+            # 文件不存在，将重试次数设为 0，不再重试
+            @retry_count = 0
+            raise "未找到上传文件（类型: #{@file_type}, 路径: #{@upload_path}）"
           end
+          puts "  找到文件: #{file_to_upload}"
+        end
 
-          # 实际上传逻辑
-          result = @upload_helper.upload_ipa(
-            ipa_path: @file_path,
-            project_name: @project_name || upload_params[:project_name]
-          )
-
-          @upload_url = result[:url] if result && result[:url]
-
-          update_progress(95, "处理上传结果...")
-        rescue => e
-          raise "IPA 上传失败: #{e.message}"
+        # 2. 如果没有 JPS 配置，延迟获取
+        if @app_info_obj.nil? || @workflow_info.nil?
+          fetch_jps_config(file_to_upload)
         end
 
-        update_progress(100, "IPA 上传成功")
+        # 3. 上传到 JPS
+        upload_to_jps(file_to_upload)
+
         {
           success: true,
-          platform: 'ios',
-          file_path: @file_path,
-          upload_url: @upload_url
+          file_type: @file_type,
+          file_path: file_to_upload
         }
       end
 
-      def upload_apk
-        update_progress(10, "准备上传 APK...")
-
-        # 获取文件大小
-        file_size = File.size(@file_path) / (1024.0 * 1024.0)
-        update_progress(20, "文件大小: #{file_size.round(2)} MB")
-
-        # 准备上传参数
-        upload_params = prepare_upload_params
-
-        update_progress(30, "开始上传到测试平台...")
-
-        # 执行上传
-        begin
-          # 模拟进度更新
-          upload_with_progress do |progress|
-            update_progress(30 + (progress * 0.6).to_i, "上传中...")
-          end
+      private
 
-          # 实际上传逻辑
-          result = @upload_helper.upload_apk(
-            apk_path: @file_path,
-            project_name: @project_name || upload_params[:project_name]
-          )
+      # 在 upload_path 下查找 file_type 类型的最新文件
+      def find_latest_file_by_type
+        search_pattern = get_search_pattern_by_file_type
 
-          @upload_url = result[:url] if result && result[:url]
+        files = Dir.glob(search_pattern)
 
-          update_progress(95, "处理上传结果...")
-        rescue => e
-          raise "APK 上传失败: #{e.message}"
+        if files.any?
+          # 返回修改时间最新的文件
+          latest_file = files.max_by { |f| File.mtime(f) }
+          return latest_file
         end
 
-        update_progress(100, "APK 上传成功")
-        {
-          success: true,
-          platform: 'android',
-          file_path: @file_path,
-          upload_url: @upload_url
-        }
+        nil
       end
 
-      def upload_web
-        update_progress(10, "准备上传 HTML...")
-
-        # Web 可能是文件夹，获取大小
-        if File.directory?(@file_path)
-          dir_size = calculate_directory_size(@file_path) / (1024.0 * 1024.0)
-          update_progress(20, "文件夹大小: #{dir_size.round(2)} MB")
+      # 根据 file_type 获取搜索模式
+      def get_search_pattern_by_file_type
+        case @file_type
+        when 'ipa'
+          File.join(@upload_path, "**", "*.ipa")
+        when 'apk'
+          File.join(@upload_path, "**", "*.apk")
+        when 'html'
+          File.join(@upload_path, "**", "*.html")
+        when 'app'
+          File.join(@upload_path, "**", "*.app")
         else
-          file_size = File.size(@file_path) / (1024.0 * 1024.0)
-          update_progress(20, "文件大小: #{file_size.round(2)} MB")
+          raise "不支持的文件类型: #{@file_type}"
         end
-
-        # 准备上传参数
-        upload_params = prepare_upload_params
-
-        update_progress(30, "开始上传到测试平台...")
-
-        # 执行上传
-        begin
-          # 模拟进度更新
-          upload_with_progress do |progress|
-            update_progress(30 + (progress * 0.6).to_i, "上传中...")
-          end
-
-          # 实际上传逻辑（可能需要压缩文件夹）
-          if File.directory?(@file_path)
-            # 压缩文件夹
-            update_progress(40, "压缩 Web 文件...")
-            zip_path = compress_directory(@file_path)
-
-            result = @upload_helper.upload_web(
-              web_path: zip_path,
-              project_name: @project_name || upload_params[:project_name]
-            )
-
-            # 清理临时文件
-            File.delete(zip_path) if File.exist?(zip_path)
-          else
-            result = @upload_helper.upload_web(
-              web_path: @file_path,
-              project_name: @project_name || upload_params[:project_name]
-            )
-          end
-
-          @upload_url = result[:url] if result && result[:url]
-
-          update_progress(95, "处理上传结果...")
-        rescue => e
-          raise "HTML 上传失败: #{e.message}"
-        end
-
-        update_progress(100, "HTML 上传成功")
-        {
-          success: true,
-          platform: 'web',
-          file_path: @file_path,
-          upload_url: @upload_url
-        }
       end
 
-      def prepare_upload_params
-        params = {}
+      # 延迟获取 JPS 配置
+      def fetch_jps_config(file_path)
+        puts "  获取 JPS 配置..."
 
-        # 从 context 获取项目信息
-        params[:project_name] = @context[:project_name] || @project_name
+        # 根据 file_type 确定 package_type
+        package_type = @file_type == 'html' ? 'zip' : @file_type
 
-        # 其他参数
-        params[:version] = @context[:version]
-        params[:build_number] = @context[:build_number]
-        params[:description] = @context[:description]
+        # 获取项目目录（从文件路径推断）
+        working_directory = @upload_path
 
-        params
-      end
+        # 调用 PgyerHelper 获取配置
+        @app_info_obj, @workflow_info = PgyerHelper.share_instace.prepare_upload(
+          working_directory: working_directory,
+          proj_name: @project_name,
+          package_type: package_type
+        )
 
-      def upload_with_progress(&block)
-        # 模拟进度回调
-        # 实际实现中，应该根据上传 API 的进度回调来更新
-        10.times do |i|
-          sleep(0.2)
-          block.call(i / 10.0) if block_given?
+        unless @app_info_obj && @workflow_info
+          raise "无法获取 JPS 配置"
         end
       end
 
-      def calculate_directory_size(path)
-        size = 0
-        Dir.glob(File.join(path, '**', '*')).each do |file|
-          size += File.size(file) if File.file?(file)
-        end
-        size
-      end
+      # 上传到 JPS 测试平台
+      def upload_to_jps(file_path)
+        pgyer_helper = PgyerHelper.share_instace
+
+        # 调用统一的上传接口
+        result_data = pgyer_helper.start_upload(
+          app_info_obj: @app_info_obj,
+          ipa_file_upload: file_path,
+          description: @context[:upload_desc],  # 从 context 获取描述
+          workflow_info: @workflow_info
+        )
+
+        # 解析上传结果
+        if result_data && result_data["data"] && result_data["data"]["id"]
+          app_version_info = result_data["data"]
+
+          # 打印应用版本信息
+          pgyer_helper.print_app_version_info(
+            app_info_obj: @app_info_obj,
+            app_version_info_obj: app_version_info
+          )
 
-      def compress_directory(dir_path)
-        require 'zip'
-        zip_path = "#{dir_path}.zip"
+          # 发送消息给自己
+          pgyer_helper.send_apptest_msg(
+            app_info_obj: @app_info_obj,
+            app_version_info_obj: app_version_info,
+            receiveType: "self"
+          )
 
-        Zip::File.open(zip_path, Zip::File::CREATE) do |zipfile|
-          Dir.glob(File.join(dir_path, '**', '**')).each do |file|
-            zipfile.add(file.sub(dir_path + '/', ''), file)
+          # 如果需要发送到测试群
+          if @context[:send_to_chat]
+            pgyer_helper.send_apptest_msg(
+              app_info_obj: @app_info_obj,
+              app_version_info_obj: app_version_info,
+              chatEnv: "DevTest",
+              receiveType: "chat"
+            )
           end
+        else
+          raise "上传失败：未获取到有效的返回数据"
         end
-
-        zip_path
-      rescue LoadError
-        # 如果没有 zip gem，使用系统命令
-        zip_path = "#{dir_path}.zip"
-        system("zip -r '#{zip_path}' '#{dir_path}'")
-        zip_path
       end
     end
   end
-end
+end