pindo 5.0.4 → 5.0.6

data/lib/pindo/client/pgyeruploadclient.rb

@@ -1,10 +1,10 @@
-
 require 'uri'
 require 'json'
 require 'faraday'
 require 'securerandom'
 require 'pindo/base/aeshelper'
 require 'typhoeus'
+require 'thread'
 
 module Pindo
 
@@ -44,6 +44,13 @@ module Pindo
             @pgyer_aes_key = config_json["pgyerapps_aes_key"]
 
             @token = load_token
+            
+            # 添加互斥锁用于线程安全
+            @upload_eTags_mutex = Mutex.new
+            @tasks_queue_mutex = Mutex.new
+            @active_tasks_mutex = Mutex.new
+            @upload_failed_mutex = Mutex.new  # 为上传失败状态添加互斥锁
+            @upload_failed = false
 
           rescue => error
               raise Informative,  "PgyerUploadClient 初始化失败！"
@@ -72,9 +79,12 @@ module Pindo
 
       def upload_file(binary_file:nil, isAttach:false)
 
+        raise Informative, "上传文件不能为空" if binary_file.nil? || !File.exist?(binary_file)
+        
         @upload_binary_file = binary_file
         @file_size = File.size(@upload_binary_file)
         @progress_bar = PgyerUploadProgressBar.new(upload_total_size:@file_size)
+        @upload_failed = false  # 重置上传失败标志
 
         extension = File.extname(@upload_binary_file)
         filename = File.basename(@upload_binary_file)
@@ -104,135 +114,231 @@ module Pindo
 
         upload_result = nil
 
-        file_size_param = 1.00 * @file_size / 1024 /1024
-        result_data = post_upload_url_req(upload_path_key:upload_path_key, file_ceil_size:file_size_param.ceil)
-
-        upload_id= result_data["data"]["uploadId"]
-        @upload_params_list = result_data["data"]["uploadParamsList"]
-        task_num = @upload_params_list.length
-        retry_count = 5
-        if task_num < 2
-          task_num = 2
-        end
-
-        if task_num > 100
-          task_num = 100
-        end
-
-        puts "线程个数: #{task_num}"
-        puts "重试次数: #{retry_count}"
-        puts
-
-        Funlog.instance.fancyinfo_start("开始上传...")
-        @upload_eTags = []
+        begin
+          file_size_param = 1.00 * @file_size / 1024 /1024
+          result_data = post_upload_url_req(upload_path_key:upload_path_key, file_ceil_size:file_size_param.ceil)
+          
+          if result_data.nil? || !result_data.has_key?("data") || !result_data["data"].has_key?("uploadId")
+            raise Informative, "获取上传ID失败，请检查网络或服务器状态"
+          end
+          
+          upload_id = result_data["data"]["uploadId"]
+          # 创建统一的任务队列
+          @tasks_queue = Queue.new
+          @worker_threads = []
+          upload_params_list = result_data["data"]["uploadParamsList"]
+          upload_item_num = upload_params_list.length
+          @expected_parts = upload_item_num  # 保存预期的分片数量
+          task_num = upload_item_num
+          retry_count = 5
+          
+          # 合理限制线程数
+          if task_num < 2
+            task_num = 2
+          end
 
-        # single_task_upload_data_req( )
+          if task_num > 30
+            task_num = 30
+          end
 
+          # 根据系统CPU核心数自动调整线程数
+          available_cores = Etc.respond_to?(:nprocessors) ? Etc.nprocessors : 4
+          task_num = [task_num, available_cores * 2].min
+          
+          # 设置重试次数并将所有任务加入队列
+          upload_params_list.each do |item|
+            item["retryCount"] = retry_count
+            @tasks_queue.push(item)
+          end
 
-        multi_task_upload_data_req(task_num:task_num, retry_count:retry_count)
+          puts "切分个数: #{upload_item_num}"
+          puts "线程个数: #{task_num}"
+          puts "重试次数: #{retry_count}"
+          puts
+
+          Funlog.instance.fancyinfo_start("开始上传...")
+          @upload_eTags = []
+          @active_tasks = 0  # 跟踪活动任务数量
+
+          continuous_upload_data_req(concurrency:task_num)
+          
+          # 检查上传是否全部成功
+          if upload_failed? || @upload_eTags.length != @expected_parts
+              upload_result = nil
+              Funlog.instance.fancyinfo_error("文件#{@upload_binary_file} 上传失败! 😭😭😭")
+              return upload_result
+          end
 
-        result_data = post_upload_finish_req(upload_path_key:upload_path_key, upload_id:upload_id, eTags:@upload_eTags)
+          result_data = post_upload_finish_req(upload_path_key:upload_path_key, upload_id:upload_id, eTags:@upload_eTags)
 
-        if result_data["code"] == 200
-            upload_result = upload_path_key
-            Funlog.instance.fancyinfo_success("文件#{@upload_binary_file} 上传成功! 😎😎😎")
-        else
-            upload_result = nil
-            Funlog.instance.fancyinfo_error("文件#{@upload_binary_file} 上传失败! 😭😭😭")
+          if result_data && result_data["code"] == 200
+              upload_result = upload_path_key
+              Funlog.instance.fancyinfo_success("文件#{@upload_binary_file} 上传成功! 😎😎😎")
+          else
+              upload_result = nil
+              error_msg = result_data && result_data["msg"] ? result_data["msg"] : "未知错误"
+              Funlog.instance.fancyinfo_error("文件#{@upload_binary_file} 上传失败: #{error_msg} 😭😭😭")
+          end
+          
+        rescue => e
+          upload_result = nil
+          Funlog.instance.fancyinfo_error("文件上传过程发生异常: #{e.message} 😭😭😭")
+        ensure
+          # 确保所有工作线程都被清理
+          cleanup_worker_threads
         end
 
         return upload_result
 
       end
 
-
-      def multi_task_upload_data_req(task_num:1, retry_count: 3)
-
-          for i in 0..@upload_params_list.length-1 do
-            @upload_params_list[i]["retryCount"] = retry_count
-          end
-
-          while @upload_params_list.size > 0
-            upload_params_list_temp = []
-            #每次最大5个线程上传
-            for i in 1..task_num do
-              upload_params_list_temp << @upload_params_list.shift
-            end
-            hydra = Typhoeus::Hydra.new
-            while upload_params_list_temp.size > 0
-                upload_params_item = upload_params_list_temp.shift
-                unless upload_params_item.nil?
-                    single_task_upload_part_data_req(upload_params_item:upload_params_item, hydra_handle:hydra)
-                end
-            end
-            hydra.run
-          end
-
+      # 安全地检查上传失败状态
+      def upload_failed?
+        @upload_failed_mutex.synchronize { @upload_failed }
       end
-
-      def single_task_upload_data_req()
-
-        for i in 0..@upload_params_list.length-1 do
-          @upload_params_list[i]["retryCount"] = 3
+      
+      # 安全地设置上传失败状态
+      def set_upload_failed(error_msg = nil)
+        @upload_failed_mutex.synchronize do 
+          @upload_failed = true
+          Funlog.instance.fancyinfo_error("上传失败: #{error_msg}") if error_msg
         end
-
-        while @upload_params_list.size > 0
-          upload_params_item = @upload_params_list.shift
-          single_task_upload_part_data_req(upload_params_item:upload_params_item)
+      end
+      
+      # 清理所有工作线程
+      def cleanup_worker_threads
+        @worker_threads.each do |thread|
+          # 尝试安全终止线程
+          thread.exit if thread.alive?
         end
-
-
-        return @eTags
+        @worker_threads.clear
       end
 
-      def single_task_upload_part_data_req(upload_params_item:nil, hydra_handle:nil)
-
+      def continuous_upload_data_req(concurrency:1)
+          # 初始化活动任务计数和条件变量
+          @active_tasks = 0
+          @task_complete_cv = ConditionVariable.new
+          
+          # 初始化连续上传，最多启动concurrency个并发任务
+          start_tasks = [concurrency, @tasks_queue.size].min
+          start_tasks.times { schedule_next_task }
+          
+          # 设置超时保护
+          timeout_seconds = 300  # 5分钟超时
+          start_time = Time.now
+          
+          # 等待所有任务完成
+          @tasks_queue_mutex.synchronize do
+              while (@active_tasks > 0 || !@tasks_queue.empty?) && !upload_failed?
+                  # 添加超时保护
+                  remaining_time = timeout_seconds - (Time.now - start_time)
+                  if remaining_time <= 0
+                    set_upload_failed("上传任务超时")
+                    break
+                  end
+                  
+                  # 等待任务完成通知，最多等待30秒
+                  @task_complete_cv.wait(@tasks_queue_mutex, [remaining_time, 30].min)
+              end
+          end
+          
+          # 检查所有分片是否都上传成功
+          if @upload_eTags.length != @expected_parts && !upload_failed?
+              set_upload_failed("部分分片上传失败，已上传#{@upload_eTags.length}/#{@expected_parts}")
+          end
+      end
+      
+      def schedule_next_task
+          # 检查是否应该停止调度
+          return if upload_failed?
+          
+          # 尝试从队列中获取下一个任务
+          @tasks_queue_mutex.synchronize do
+              unless @tasks_queue.empty?
+                  upload_params_item = @tasks_queue.pop
+                  @active_tasks_mutex.synchronize { @active_tasks += 1 }
+                  
+                  # 异步处理任务，不阻塞主线程
+                  worker_thread = Thread.new do
+                      begin
+                          process_upload_task(upload_params_item)
+                      rescue => e
+                          # 捕获并记录任务处理过程中的异常
+                          set_upload_failed("处理分片#{upload_params_item["partNo"]}时出错: #{e.message}")
+                      ensure
+                          # 任务完成后，减少活动任务计数并通知等待线程
+                          @active_tasks_mutex.synchronize { @active_tasks -= 1 }
+                          
+                          # 如果队列不为空，调度下一个任务
+                          schedule_next_task if !upload_failed?
+                          
+                          # 通知等待线程任务已完成
+                          @tasks_queue_mutex.synchronize { @task_complete_cv.broadcast }
+                      end
+                  end
+                  
+                  # 保存线程引用以便后续清理
+                  @worker_threads << worker_thread
+              end
+          end
+      end
+      
+      def process_upload_task(upload_params_item)
           upload_url = upload_params_item["signedUrl"]
           part_no = upload_params_item["partNo"]
-
+          
           file_size_ele = 1024 * 1024 * 5  #5M
-          start_position = file_size_ele * (part_no -1)
+          start_position = file_size_ele * (part_no - 1)
           if part_no * file_size_ele > @file_size
-            read_length = @file_size - start_position
+              read_length = @file_size - start_position
           else
-            read_length = file_size_ele
+              read_length = file_size_ele
           end
-
+          
           file = File.open(@upload_binary_file, "rb")
-          file.seek(start_position)
-          put_data = file.read(read_length)
-
-          request = create_req(upload_url:upload_url, body_data:put_data, read_length:read_length)
-          request.on_progress do |dltotal, dlnow, ultotal, ulnow|
-              if ulnow
-                @progress_bar.update_upload_index(upload_part:part_no, upload_size:ulnow)
-                @progress_bar.update_upload_progress()
+          begin
+              file.seek(start_position)
+              put_data = file.read(read_length)
+              
+              request = create_req(upload_url:upload_url, body_data:put_data, read_length:read_length)
+              
+              # 设置上传进度回调
+              upload_size_last = 0
+              request.on_progress do |dltotal, dlnow, ultotal, ulnow|
+                  if ulnow && ulnow > upload_size_last
+                      upload_size_last = ulnow
+                      @progress_bar.update_upload_index(upload_part:part_no, upload_size:ulnow)
+                      @progress_bar.update_upload_progress()
+                  end
               end
-          end
-
-          request.on_complete do |response|
+              
+              # 设置请求超时
+              request.options[:timeout] = 300  # 5分钟超时
+              
+              # 执行请求并等待完成
+              response = request.run
+              
+              # 处理响应结果
               if response.success?
-                @progress_bar.complete_upload_index(upload_part:part_no, complete_size:read_length)
-                etag = response.headers["ETag"]
-                eTag_item = { partNumber: part_no, tag: etag}
-                @upload_eTags << eTag_item
+                  @progress_bar.complete_upload_index(upload_part:part_no, complete_size:read_length)
+                  etag = response.headers["ETag"]
+                  if etag.nil? || etag.empty?
+                    raise "服务器返回的ETag为空"
+                  end
+                  eTag_item = { partNumber: part_no, tag: etag}
+                  @upload_eTags_mutex.synchronize { @upload_eTags << eTag_item }
               else
-                @progress_bar.delete_upload_index(upload_part:part_no)
-                upload_params_item["retryCount"] = upload_params_item["retryCount"] - 1
-                if upload_params_item["retryCount"] > 0
-                  # @upload_params_list.push(upload_params_item)
-                  single_task_upload_part_data_req(upload_params_item:upload_params_item, hydra_handle:hydra_handle)
-                else
-                  Funlog.instance.fancyinfo_error("文件#{@upload_binary_file} 上传失败! 😭😭😭")
-                  raise Informative, "上传文件失败"
-                end
+                  @progress_bar.delete_upload_index(upload_part:part_no)
+                  upload_params_item["retryCount"] = upload_params_item["retryCount"] - 1
+                  if upload_params_item["retryCount"] > 0
+                      # 重试任务
+                      @tasks_queue_mutex.synchronize { @tasks_queue.push(upload_params_item) }
+                  else
+                      set_upload_failed("文件#{@upload_binary_file} 分片#{part_no}上传失败: HTTP #{response.code}")
+                  end
               end
-          end
-
-          if hydra_handle.nil?
-            request.run
-          else
-            hydra_handle.queue(request)
+          ensure
+              file.close
           end
       end
 
@@ -284,26 +390,30 @@ module Pindo
               tags:eTags
           }
 
-          con = HttpClient.create_instance_with_proxy
-          res = con.post do |req|
-              req.url boss_url
-              req.headers['Content-Type'] = 'application/json'
-              req.headers['token'] = @token["token"]
-              req.body = body_params.to_json
-          end
+          begin
+            con = HttpClient.create_instance_with_proxy
+            res = con.post do |req|
+                req.url boss_url
+                req.headers['Content-Type'] = 'application/json'
+                req.headers['token'] = @token["token"]
+                req.body = body_params.to_json
+                req.options.timeout = 120  # 设置2分钟超时
+            end
 
+            result_data = nil
+            if !res.body.nil?
+                result_data = JSON.parse(res.body)
+            end
 
-          result_data = nil
-          if !res.body.nil?
-              result_data = JSON.parse(res.body)
+            return result_data
+          rescue => e
+            Funlog.instance.fancyinfo_error("完成上传请求失败: #{e.message}")
+            return nil
           end
-
-          return  result_data
-
       end
 
 
-        def post_upload_url_req(upload_path_key:nil, file_ceil_size:nil)
+      def post_upload_url_req(upload_path_key:nil, file_ceil_size:nil)
 
           boss_url = @baseurl + @request_config["multi_signed_url_upload"]
 
@@ -313,22 +423,26 @@ module Pindo
               fileSize:file_ceil_size
           }
 
-          con = HttpClient.create_instance_with_proxy
-          res = con.post do |req|
-              req.url boss_url
-              req.headers['Content-Type'] = 'application/json'
-              req.headers['token'] = @token["token"]
-              req.body = body_params.to_json
-          end
+          begin
+            con = HttpClient.create_instance_with_proxy
+            res = con.post do |req|
+                req.url boss_url
+                req.headers['Content-Type'] = 'application/json'
+                req.headers['token'] = @token["token"]
+                req.body = body_params.to_json
+                req.options.timeout = 60  # 设置1分钟超时
+            end
 
+            result_data = nil
+            if !res.body.nil?
+                result_data = JSON.parse(res.body)
+            end
 
-          result_data = nil
-          if !res.body.nil?
-              result_data = JSON.parse(res.body)
+            return result_data
+          rescue => e
+            Funlog.instance.fancyinfo_error("获取上传URL失败: #{e.message}")
+            return nil
           end
-
-          return  result_data
-
       end
 
       class PgyerUploadProgressBar
@@ -341,50 +455,58 @@ module Pindo
         attr_accessor :is_done
 
         def initialize(upload_total_size:nil, draw_char:'>')
-
-
           @upload_total_size = upload_total_size
           @draw_char = draw_char
           @last_update_time = (Time.now.to_f * 1000).to_i #毫秒
 
           @complete_size = 0
           @update_ing_size = {}
-
           @is_done = false
+          
+          # 添加互斥锁来保护进度条更新
+          @mutex = Mutex.new
         end
 
         def update_upload_index(upload_part:nil, upload_size:nil)
-            @update_ing_size[upload_part] = upload_size
+            @mutex.synchronize do
+                @update_ing_size[upload_part] = upload_size
+            end
         end
 
         def delete_upload_index(upload_part:nil)
-            @update_ing_size[upload_part] = 0
+            @mutex.synchronize do
+                @update_ing_size[upload_part] = 0
+            end
         end
 
         def complete_upload_index(upload_part:nil, complete_size:nil)
-            @complete_size = @complete_size + complete_size
-            @update_ing_size[upload_part] = 0
+            @mutex.synchronize do
+                @complete_size = @complete_size + complete_size
+                @update_ing_size[upload_part] = 0
+            end
         end
 
         def update_upload_progress()
             time_now = (Time.now.to_f * 1000).to_i #毫秒
             if time_now - @last_update_time > 80
-                @last_update_time = time_now
-                total_num = @upload_total_size
-                index_num = @complete_size
-                @update_ing_size.each do |key, value|
-                   index_num = index_num + value
-                end
-
-                progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
-                total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 )
-                upload_size = sprintf("%.2f", 1.00 * index_num / 1024 /1024 )
-                index = 40.0 * index_num / total_num
-                upload_message = "已上传:#{upload_size}MB|#{progress_str}\%【" + (@draw_char * (index/1).floor).ljust(40.0, '_') +  "】Total:#{total_size}MB"
-                Funlog.instance.fancyinfo_update(upload_message)
-                if index_num == total_num && !@is_done
-                  @is_done = true
-                  Funlog.instance.fancyinfo_success(upload_message)
+                @mutex.synchronize do
+                    @last_update_time = time_now
+                    total_num = @upload_total_size
+                    index_num = @complete_size
+                    @update_ing_size.each do |key, value|
+                       index_num = index_num + value
+                    end
+
+                    progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
+                    total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 )
+                    upload_size = sprintf("%.2f", 1.00 * index_num / 1024 /1024 )
+                    index = 40.0 * index_num / total_num
+                    upload_message = "已上传:#{upload_size}MB|#{progress_str}\%【" + (@draw_char * (index/1).floor).ljust(40.0, '_') +  "】Total:#{total_size}MB"
+                    Funlog.instance.fancyinfo_update(upload_message)
+                    if index_num == total_num && !@is_done
+                      @is_done = true
+                      Funlog.instance.fancyinfo_success(upload_message)
+                    end
                 end
             end
         end

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

@@ -0,0 +1,121 @@
+require 'highline/import'
+require 'fileutils'
+require 'pindo/base/executable'
+require 'pindo/module/build/buildhelper'
+require 'pindo/module/android/build_helper'
+
+module Pindo
+  class Command
+    class Android < Command
+      class Autobuild < Android
+        include Appselect
+
+        self.summary = '打包Android工程并发布到蒲公英'
+        self.description = <<-DESC
+          编译Android包并支持上传到测试平台。
+
+          支持功能:
+              * 编译Debug/Release包
+              * 上传到测试平台
+              * 发送测试通知
+
+          使用示例:
+              $ pindo android autobuild                    # 编译Debug包
+              $ pindo android autobuild --release          # 编译Release包
+              $ pindo android autobuild --upload           # 编译并上传
+              $ pindo android autobuild --send             # 编译上传并发送通知
+              $ pindo android autobuild --proj=myapp       # 指定项目名称
+
+        DESC
+
+        def self.options
+          [
+            ['--release', '使用release模式构建'],
+            ['--proj',   '指定上传到测试平台的项目名称'],
+            ['--upload', '上传编译后的apk到测试平台'],
+            ['--send',   '上传成功后发送测试通知']
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @args_release_flag = argv.flag?('release', false)
+          @args_upload_flag = argv.flag?('upload', false)
+          @args_send_flag = argv.flag?('send', false)
+          @args_proj_name = argv.option('proj')
+
+
+          if @args_send_flag
+            @args_upload_flag = true
+          end
+
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def run
+          pindo_project_dir = Dir.pwd
+          build_helper = Pindo::BuildHelper.share_instance
+          project_type = build_helper.project_type(pindo_project_dir)
+
+          args_temp = []
+          args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
+          args_temp << "--upload" if @args_upload_flag
+          args_temp << "--send" if @args_send_flag
+
+          case project_type
+          when :ios
+            puts "iOS 工程， 请使用 pindo ios build"
+          when :android
+            android_autobuild
+          when :unity
+            Pindo::Command::Unity::Apk::run(args_temp)
+          else
+            raise Informative, "当前目录不是工程目录，不能编译"
+          end
+        end
+
+        private
+
+        def android_autobuild
+
+          pindo_project_dir = Dir.pwd
+          build_helper = Pindo::BuildHelper.share_instance
+
+          if @args_upload_flag
+            build_helper.check_check_and_install_cliff(pindo_project_dir)
+            is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
+            if is_need_add_tag
+                Pindo::Command::Dev::Tag::run(tag_action_parms)
+            end
+          end
+
+          app_info_obj = nil
+          if @args_upload_flag
+              proj_name = @args_proj_name
+              app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
+          end
+
+          android_build_helper = Pindo::AndroidBuildHelper.share_instance
+          apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_flag)
+          ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
+
+          if !ipa_file_upload.nil? && !app_info_obj.nil?
+              description = nil
+              result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
+              if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
+                  msg_data = PgyerHelper.share_instace.make_msg_data(app_info_obj:app_info_obj, app_version_info_obj:result_data["data"])
+                  PgyerHelper.share_instace.print_app_version_info(msg_data:msg_data)
+                  if @args_send_flag
+                      PgyerHelper.share_instace.send_apptest_wechat_msg(msg_data:msg_data)
+                  end
+              end
+          end
+
+          system "open #{pindo_project_dir}"
+
+
+        end
+      end
+    end
+  end
+end