pindo 5.11.2 → 5.11.3

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

@@ -0,0 +1,278 @@
+require_relative '../pindo_task'
+
+module Pindo
+  module TaskSystem
+    class UploadTask < PindoTask
+      attr_reader :platform, :file_path, :upload_url
+
+      def self.task_type
+        :upload
+      end
+
+      def self.execution_mode
+        ExecutionMode::CONCURRENT  # 上传可以并发执行
+      end
+
+      def self.execution_type
+        ExecutionType::ASYNC  # 在新线程异步执行
+      end
+
+      def initialize(platform, file_path, options = {})
+        @platform = platform
+        @file_path = file_path
+        @project_name = options[:project_name]
+        @upload_helper = options[:upload_helper]
+        @upload_url = nil
+
+        name = case platform
+               when 'ios', 'ipa'
+                 "上传 IPA"
+               when 'android', 'apk'
+                 "上传 APK"
+               when 'web', 'html'
+                 "上传 HTML"
+               else
+                 "上传 #{platform.upcase}"
+               end
+
+        super(name, options)
+      end
+
+      def validate
+        # 如果文件路径为空，暂时跳过验证（可能从构建任务结果获取）
+        return true if @file_path.nil?
+
+        # 验证文件是否存在
+        unless File.exist?(@file_path)
+          @error = "上传文件不存在：#{@file_path}"
+          return false
+        end
+
+        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
+        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, "上传中...")
+          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}"
+        end
+
+        update_progress(100, "IPA 上传成功")
+        {
+          success: true,
+          platform: 'ios',
+          file_path: @file_path,
+          upload_url: @upload_url
+        }
+      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
+
+          # 实际上传逻辑
+          result = @upload_helper.upload_apk(
+            apk_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 "APK 上传失败: #{e.message}"
+        end
+
+        update_progress(100, "APK 上传成功")
+        {
+          success: true,
+          platform: 'android',
+          file_path: @file_path,
+          upload_url: @upload_url
+        }
+      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")
+        else
+          file_size = File.size(@file_path) / (1024.0 * 1024.0)
+          update_progress(20, "文件大小: #{file_size.round(2)} MB")
+        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 = {}
+
+        # 从 context 获取项目信息
+        params[:project_name] = @context[:project_name] || @project_name
+
+        # 其他参数
+        params[:version] = @context[:version]
+        params[:build_number] = @context[:build_number]
+        params[:description] = @context[:description]
+
+        params
+      end
+
+      def upload_with_progress(&block)
+        # 模拟进度回调
+        # 实际实现中，应该根据上传 API 的进度回调来更新
+        10.times do |i|
+          sleep(0.2)
+          block.call(i / 10.0) if block_given?
+        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
+
+      def compress_directory(dir_path)
+        require 'zip'
+        zip_path = "#{dir_path}.zip"
+
+        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)
+          end
+        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

data/lib/pindo/module/task/pindo_task.rb

@@ -0,0 +1,237 @@
+require 'securerandom'
+require 'thread'
+
+module Pindo
+  module TaskSystem
+    # 任务取消异常
+    class TaskCancelledException < StandardError; end
+    # 执行模式：控制并发策略
+    module ExecutionMode
+      EXCLUSIVE = :exclusive           # 独占：阻塞所有其他任务
+      TYPE_EXCLUSIVE = :type_exclusive # 类型独占：同类型串行
+      CONCURRENT = :concurrent         # 并发：可与任意任务并行
+    end
+
+    # 执行类型：控制在哪个线程执行
+    module ExecutionType
+      SYNC = :sync           # 同步执行（在主线程）
+      ASYNC = :async         # 异步执行（在新线程）
+    end
+
+    # 任务状态
+    module TaskStatus
+      PENDING = :pending       # 待执行
+      TRIGGERED = :triggered   # 已触发
+      RUNNING = :running       # 执行中
+      SUCCESS = :success       # 成功
+      FAILED = :failed         # 失败
+      CANCELLED = :cancelled   # 取消
+    end
+
+    # 任务优先级
+    module TaskPriority
+      LOW = 0
+      NORMAL = 5
+      HIGH = 10
+      CRITICAL = 15
+    end
+
+    # PindoTask 基类
+    class PindoTask
+      attr_accessor :id, :name, :status, :error, :result, :progress, :progress_message
+      attr_reader :type, :execution_mode, :execution_type, :priority, :dependencies
+      attr_accessor :context, :metadata, :thread
+      attr_reader :created_at, :started_at, :finished_at
+
+      def initialize(name, options = {})
+        @id = SecureRandom.uuid
+        @name = name
+        @type = self.class.task_type
+        @execution_mode = options[:execution_mode] || self.class.execution_mode
+        @execution_type = options[:execution_type] || self.class.execution_type
+        @priority = options[:priority] || TaskPriority::NORMAL
+        @status = TaskStatus::PENDING
+        @dependencies = options[:dependencies] || []
+        @context = options[:context] || {}
+        @metadata = options[:metadata] || {}
+        @progress = 0
+        @progress_message = nil
+        @error = nil
+        @result = nil
+        @thread = nil  # 执行线程
+        @created_at = Time.now
+        @started_at = nil
+        @finished_at = nil
+        @mutex = Mutex.new
+        @condition = ConditionVariable.new
+        @callbacks = {
+          before: [],
+          after: [],
+          on_success: [],
+          on_failure: [],
+          on_progress: []
+        }
+      end
+
+      # 子类配置
+      def self.task_type
+        raise NotImplementedError, "Subclass must define task_type"
+      end
+
+      def self.execution_mode
+        ExecutionMode::TYPE_EXCLUSIVE  # 默认同类型串行
+      end
+
+      def self.execution_type
+        ExecutionType::ASYNC  # 默认异步执行
+      end
+
+      # 同步执行（在当前线程）
+      def do_task
+        execute_internal
+      end
+
+      # 异步执行（在新线程）
+      def async_do_task
+        @thread = Thread.new do
+          begin
+            execute_internal
+          rescue => e
+            @error = e
+            @status = TaskStatus::FAILED
+            puts "[Task Error] #{@name}: #{e.message}".red if defined?(String.red)
+          end
+        end
+      end
+
+      # 等待异步任务完成
+      def wait
+        @thread&.join
+      end
+
+      # 检查是否完成
+      def finished?
+        [TaskStatus::SUCCESS, TaskStatus::FAILED, TaskStatus::CANCELLED].include?(@status)
+      end
+
+      # 是否正在运行
+      def running?
+        @status == TaskStatus::RUNNING
+      end
+
+      # 验证任务是否可以执行
+      def validate
+        true
+      end
+
+      # 取消任务
+      def cancel
+        @mutex.synchronize do
+          if @status == TaskStatus::PENDING || @status == TaskStatus::TRIGGERED
+            @status = TaskStatus::CANCELLED
+            @condition.signal
+            true
+          else
+            false
+          end
+        end
+      end
+
+      # 执行时间
+      def execution_time
+        return nil unless @started_at
+        end_time = @finished_at || Time.now
+        end_time - @started_at
+      end
+
+      # 更新进度
+      def update_progress(value, message = nil)
+        # 检查是否已取消
+        check_cancelled!
+
+        @progress = value.clamp(0, 100)
+        @progress_message = message
+        run_callbacks(:on_progress)
+      end
+
+      # 检查是否已取消，如果已取消则抛出异常
+      def check_cancelled!
+        if @status == TaskStatus::CANCELLED
+          raise TaskCancelledException.new("任务已被取消: #{@name}")
+        end
+      end
+
+      # 检查是否已取消（不抛异常）
+      def cancelled?
+        @status == TaskStatus::CANCELLED
+      end
+
+      # 添加回调
+      def on(event, &block)
+        @callbacks[event] << block if @callbacks[event]
+      end
+
+      protected
+
+      # 子类必须实现
+      def do_work
+        raise NotImplementedError, "Subclass must implement do_work method"
+      end
+
+      private
+
+      # 内部执行逻辑
+      def execute_internal
+        begin
+          @mutex.synchronize do
+            return if @status == TaskStatus::CANCELLED
+            @status = TaskStatus::RUNNING
+            @started_at = Time.now
+          end
+
+          run_callbacks(:before)
+
+          # 子类实现具体逻辑
+          @result = do_work
+
+          @mutex.synchronize do
+            @status = TaskStatus::SUCCESS
+            @condition.signal
+          end
+
+          run_callbacks(:on_success)
+        rescue TaskCancelledException => e
+          # 任务被取消
+          @mutex.synchronize do
+            @status = TaskStatus::CANCELLED
+            @error = e
+            @condition.signal
+          end
+
+          puts "[Task] #{@name} 已被取消".yellow if defined?(String.yellow)
+          # 不抛出异常，正常结束
+        rescue => e
+          @mutex.synchronize do
+            @error = e
+            @status = TaskStatus::FAILED
+            @condition.signal
+          end
+
+          run_callbacks(:on_failure)
+          raise if should_raise_on_failure?
+        ensure
+          @finished_at = Time.now
+          run_callbacks(:after)
+        end
+      end
+
+      def run_callbacks(event)
+        @callbacks[event].each { |cb| cb.call(self) }
+      end
+
+      def should_raise_on_failure?
+        @metadata[:raise_on_failure] != false
+      end
+    end
+  end
+end

data/lib/pindo/module/task/task_config.rb

@@ -0,0 +1,84 @@
+module Pindo
+  module TaskSystem
+    # 任务系统配置
+    module TaskConfig
+      # Unity 导出路径配置
+      UNITY_EXPORT_PATHS = {
+        ios: 'GoodPlatform/iOS',
+        android: 'GoodPlatform/Android',
+        web: 'GoodPlatform/Web',
+        webgl: 'GoodPlatform/WebGL'
+      }.freeze
+
+      # 构建输出搜索路径模式
+      BUILD_OUTPUT_PATTERNS = {
+        ipa: [
+          'build/**/*.ipa',
+          'output/**/*.ipa',
+          'GoodPlatform/iOS/**/*.ipa',
+          '**/*.ipa'
+        ].freeze,
+
+        apk: [
+          'build/**/*.apk',
+          'output/**/*.apk',
+          'GoodPlatform/Android/**/*.apk',
+          'app/build/outputs/apk/**/*.apk',
+          '**/*.apk'
+        ].freeze,
+
+        aab: [
+          'build/**/*.aab',
+          'output/**/*.aab',
+          'GoodPlatform/Android/**/*.aab',
+          'app/build/outputs/bundle/**/*.aab',
+          '**/*.aab'
+        ].freeze,
+
+        web: [
+          'build/web',
+          'build/webgl',
+          'output/web',
+          'output/webgl',
+          'GoodPlatform/Web',
+          'GoodPlatform/WebGL',
+          'Build/WebGL',
+          'dist',
+          'public'
+        ].freeze,
+
+        web_zip: [
+          'build/**/*web*.zip',
+          'output/**/*web*.zip',
+          '**/*webgl*.zip'
+        ].freeze
+      }.freeze
+
+      # 需要过滤的文件名模式（测试包、调试包等）
+      EXCLUDED_PATTERNS = [
+        'test',
+        'debug',
+        'unsigned',
+        'unaligned'
+      ].freeze
+
+      # 平台映射
+      PLATFORM_MAPPING = {
+        'ipa' => 'ios',
+        'apk' => 'android',
+        'aab' => 'android',
+        'html' => 'web'
+      }.freeze
+
+      # 显示名称映射
+      DISPLAY_NAMES = {
+        'ios' => 'iOS',
+        'android' => 'Android',
+        'web' => 'WebGL',
+        'ipa' => 'IPA',
+        'apk' => 'APK',
+        'html' => 'HTML'
+      }.freeze
+    end
+  end
+end