pindo 5.0.5 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3875a278d39ee97be6efefd2e2691f398cb0ec145c079e6ff261181e1f7c4cde
-  data.tar.gz: 463a3b8a6b68376a35017ed3fe9457c86d06ee60eeb3404d02e3aaaca2f152d5
+  metadata.gz: cd1d664dc77bc75c43a1816a8316fafb10351c9133a4e9dabf403f010bd1882a
+  data.tar.gz: 7e4387a7ad42c6830898bd9466a7ea8131ab92429b78ed5ed61479b07eebe44f
 SHA512:
-  metadata.gz: 693df9ad920466ab0f93c13e0f5774d970fa24fefb66ff7f0722ca56e25d687098cddb8808113cc4c02feb97d75d7e02ee4b78a6de9f9ec33c545bf8748c910d
-  data.tar.gz: ac047d01af53a8b1be66faf6e6aa667e64d67135d32c1d4c8fc4313a59f4df2bb5b18032d2f659eec81f21c3c43a4f8bccfbc6aa0fe94030b86f82e42cf6facd
+  metadata.gz: 305e2b32210bf046c6d56a82cff9f799e9bf73672e812aa28e3c78e378b32bc8c4700f5f4f45cfe39e3301427632f6074c2f6b419778c51a21de15dc19d8a676
+  data.tar.gz: 991b426167216c8c2f95fbd99400314fe807f892a6975300d145ff1e07684611547f6a89df7fbabd634d5f0f076839928fb89a1787977b313e4b1e332029a997

data/lib/pindo/client/bossconfigclient.rb

@@ -49,10 +49,9 @@ module Pindo
 
       def do_login()
 
-        # username = ask('请输入Boss网站的用户名:')
-        # password = ask('请输入Boss网站的密码:')
-        username = "shuangquan"
-        password = "HIsdfUHfwdh"
+        username = ask('请输入Boss网站的用户名:')
+        password = ask('请输入Boss网站的密码:')
+
 
         do_login_req(username:username, password:password)
       end

data/lib/pindo/client/pgyer_feishu_oauth_cli.rb

@@ -0,0 +1,412 @@
+#!/usr/bin/env ruby
+
+require 'webrick'
+require 'json'
+require 'net/http'
+require 'uri'
+require 'securerandom'
+require 'digest'
+require 'base64'
+require 'fileutils'
+require 'pindo/base/aeshelper'
+require 'pindo/config/pindouserlocalconfig'
+require 'pindo/client/httpclient'
+
+module Pindo
+ 
+  class PgyerFeishuOAuthCLI
+    attr_reader :access_token, :username, :expires_at
+
+    def initialize(client_id)
+      @client_id = client_id
+      @feishu_auth_url = 'https://passport.feishu.cn/suite/passport/oauth/authorize?'
+      
+      # 保持原有的redirect_uri，飞书OAuth流程中仍使用这个URL
+      # 前端UI会检测state=terminal_login并自动跳转到localhost:8899
+      @redirect_uri = 'https://pgyerapps.com/login'
+      @pgyer_api_endpoint = 'https://api.pgyerapps.com/api/user/lark_qr_login'
+      
+      @state = 'terminal_login'
+      
+      @larkScopeList = [
+        'task:task:write',
+        'task:section:write',
+        'task:custom_field:write',
+        'task:tasklist:write'
+      ];
+
+      @access_token = nil
+      @username = nil
+      @expires_at = nil
+    end
+
+    # 启动授权流程
+    def authorize
+      # 不再检查已存储的令牌，直接开始授权流程
+      authorization_uri = build_authorization_uri
+      puts "正在打开浏览器进行飞书OAuth授权..."
+      puts "授权URI: #{authorization_uri}"
+      puts "注意：授权成功后，网页将自动跳转至本地http://localhost:8899"
+      
+      # 在浏览器中打开授权URL
+      open_browser(authorization_uri)
+      
+      # 启动本地服务器处理回调
+      code = start_callback_server
+      
+      # 如果自动获取失败，提示用户手动输入
+      if code.nil?
+        puts "自动获取授权码失败，您可以手动输入："
+        puts "1. 授权码 (直接复制'code='后面的内容)"
+        puts "2. 完整回调URL (例如: http://localhost:8899/?code=xxxx...)"
+        print "> "
+        input = STDIN.gets.chomp
+        
+        if input.start_with?("http")
+          # 尝试从URL中提取code
+          begin
+            uri = URI(input)
+            query_params = URI.decode_www_form(uri.query || '').to_h
+            code = query_params['code']
+            if code
+              puts "从URL中成功提取授权码"
+            end
+          rescue => e
+            puts "无法从URL中提取授权码: #{e.message}"
+          end
+        else
+          # 将输入直接作为code
+          code = input unless input.empty?
+        end
+      end
+      
+      if code
+        puts "成功获取授权码！正在使用飞书身份登录Pgyer..."
+        puts "code: #{code}"
+        if login_pgyer_with_feishu(code:code)
+          puts "Pgyer登录成功！"
+          # 登录成功后，返回true，外部程序可以通过访问access_token属性获取token
+          return true
+        end
+        return false
+      else
+        puts "授权失败"
+        return false
+      end
+    end
+
+    # 验证Pgyer令牌
+    def validate_pgyer_token(token = nil, expires_at = nil)
+      token_to_check = token || @access_token
+      expiration_time = expires_at || @expires_at
+      
+      # 首先检查token是否存在
+      return false unless token_to_check
+      
+      # 然后检查token是否过期
+      if expiration_time && Time.now.to_i > expiration_time
+        puts "令牌已过期，需要重新登录"
+        return false
+      end
+      
+      # 最后验证token是否有效
+      uri = URI("https://www.pgyer.com/api/user/profile")
+      request = Net::HTTP::Get.new(uri)
+      request['Authorization'] = "Bearer #{token_to_check}"
+      
+      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+        http.request(request)
+      end
+      
+      return response.code == '200'
+    end
+
+    # 使用code登录Pgyer, 并且Pgyer返回token
+    def login_pgyer_with_feishu(code: nil)
+      return false unless code
+      
+      # 构造请求体
+      body_params = {
+        code: code,
+        redirectUri: @redirect_uri,
+        scope: @larkScopeList.join(' ')
+      }
+      
+      puts "请求Pgyer API: #{@pgyer_api_endpoint}"
+      puts "请求参数: #{body_params.to_json}"
+      
+      # 使用HttpClient发送请求
+      con = HttpClient.create_instance_with_proxy
+      
+      begin
+        res = con.post do |req|
+          req.url @pgyer_api_endpoint
+          req.headers['Content-Type'] = 'application/json'
+          req.body = body_params.to_json
+        end
+        
+        puts "API响应状态码: #{res.status}"
+        
+        # 处理响应
+        result = nil
+        if !res.body.nil?
+          begin
+            result = JSON.parse(res.body)
+            # puts "解析后的响应: #{result.inspect}"
+            
+            if result['code'] == 200 && !result['data'].nil? && !result['data']['token'].nil?
+              @access_token = result['data']['token']
+              @username = result['data']['username'] if result['data']['username']
+              # 设置token有效期为7天后
+              @expires_at = Time.now.to_i + 6 * 24 * 60 * 60  # 7天的秒数
+              return true
+            else
+              error_msg = result['meta'] && result['meta']['message'] ? result['meta']['message'] : '未知错误'
+              puts "Pgyer登录失败: #{error_msg}"
+              return false
+            end
+          rescue => e
+            puts "解析响应失败: #{e.message}"
+            puts "原始响应: #{res.body[0..200]}"
+            return false
+          end
+        else
+          puts "请求返回空响应"
+          return false
+        end
+      rescue => e
+        puts "请求过程中出错: #{e.class} - #{e.message}"
+        return false
+      end
+    end
+
+    private
+
+
+    # 构建授权URI
+    def build_authorization_uri
+      uri = URI(@feishu_auth_url)
+
+      params = {
+        'client_id' => @client_id,
+        'redirect_uri' => @redirect_uri,
+        'response_type' => 'code',
+        'state' => @state,
+        'scope' => @larkScopeList.join(' ')
+      }
+      
+      uri.query = URI.encode_www_form(params)
+      uri.to_s
+    end
+
+    # 在浏览器中打开URL
+    def open_browser(url)
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+        system("start", url)
+      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
+        system("open", url)
+      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+        system("xdg-open", url)
+      else
+        puts "无法自动打开浏览器，请手动访问: #{url}"
+      end
+    end
+
+    # 启动本地服务器处理回调
+    def start_callback_server
+      code = nil
+      
+      puts "启动本地服务器，监听端口8899..."
+      
+      # 使用本地8899端口处理回调，不管redirect_uri配置如何
+      server = WEBrick::HTTPServer.new(
+        Port: 8899,
+        Logger: WEBrick::Log.new("/dev/null"),
+        AccessLog: []
+      )
+
+      # 处理根路径的请求
+      server.mount_proc '/' do |req, res|
+        begin
+          # puts "接收到请求: #{req.request_line}"
+          # puts "请求参数: #{req.query_string}"
+          
+          # 安全解析请求参数
+          begin
+            query_params = URI.decode_www_form(req.query_string || '').to_h
+            puts "解析的参数: #{query_params.inspect}"
+          rescue => e
+            puts "解析请求参数失败: #{e.message}"
+            query_params = {}
+          end
+          
+          # if query_params['state'] != @state
+          #   puts "状态不匹配: 接收到 #{query_params['state']}，期望 #{@state}"
+          #   res.content_type = "text/html; charset=UTF-8"
+          #   res.body = "状态不匹配，可能存在CSRF攻击风险"
+          # elsif query_params['error']
+          if query_params['error']
+            puts "授权错误: #{query_params['error']}"
+            res.content_type = "text/html; charset=UTF-8"
+            res.body = "授权错误: #{query_params['error']}"
+          elsif query_params['code']
+            code = query_params['code']
+            puts "成功获取授权码: #{code}"
+            res.content_type = "text/html; charset=UTF-8"
+            res.body = <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <head>
+              <meta charset="UTF-8">
+              <title>飞书授权成功</title>
+              <style>
+                body { font-family: Arial, sans-serif; text-align: center; padding: 40px; }
+                .container { max-width: 600px; margin: 0 auto; }
+                .success { color: #4CAF50; }
+                .code { font-family: monospace; background: #f5f5f5; padding: 10px; border-radius: 4px; word-break: break-all; }
+                .countdown { font-weight: bold; color: #FF5722; }
+                .autoclose-banner { 
+                  background-color: #333; color: white; padding: 10px; 
+                  position: fixed; top: 0; left: 0; right: 0;
+                  display: flex; justify-content: space-between; align-items: center;
+                }
+                .close-btn {
+                  background: #f44336; color: white; border: none;
+                  padding: 5px 10px; cursor: pointer; border-radius: 3px;
+                }
+              </style>
+              <script>
+                // 尝试多种方法关闭窗口
+                function attemptClose() {
+                  try {
+                    // 方法1: 最基本的关闭尝试
+                    window.close();
+                    
+                    // 方法2: 对于某些浏览器需要历史记录操作
+                    window.history.back();
+                    
+                    // 方法3: 空白页替换
+                    window.location.href = "about:blank";
+                    
+                    // 方法4: 尝试使用opener关系
+                    if (window.opener) {
+                      window.opener.focus();
+                      window.close();
+                    }
+                    
+                    // 如果以上方法都失败了，显示手动关闭提示
+                    setTimeout(function() {
+                      document.getElementById('close-message').style.display = 'block';
+                      document.getElementById('countdown-container').style.display = 'none';
+                    }, 1000);
+                  } catch (e) {
+                    console.error("关闭窗口失败:", e);
+                    document.getElementById('close-message').style.display = 'block';
+                    document.getElementById('countdown-container').style.display = 'none';
+                  }
+                }
+                
+                // 倒计时函数
+                var secondsLeft = 3;
+                function updateCountdown() {
+                  document.getElementById('countdown').innerText = secondsLeft;
+                  if (secondsLeft <= 0) {
+                    attemptClose();
+                  } else {
+                    secondsLeft -= 1;
+                    setTimeout(updateCountdown, 1000);
+                  }
+                }
+                
+                // 初始化
+                window.onload = function() {
+                  updateCountdown();
+                }
+              </script>
+            </head>
+            <body>
+              <div class="autoclose-banner">
+                <span>授权成功! 此窗口将自动关闭 (<span id="countdown" class="countdown">3</span>)</span>
+                <button class="close-btn" onclick="attemptClose()">立即关闭</button>
+              </div>
+              
+              <div class="container">
+                <h1 class="success">飞书授权成功！</h1>
+                <p>已获取授权码，正在返回命令行...</p>
+                
+                <div id="countdown-container">
+                  <p>此窗口将在 <span id="countdown-text" class="countdown">3</span> 秒后自动关闭</p>
+                </div>
+                
+                <div id="close-message" style="display: none;">
+                  <p>自动关闭失败，请手动关闭此窗口</p>
+                  <button class="close-btn" onclick="attemptClose()">尝试再次关闭</button>
+                </div>
+                
+                <p>授权码：</p>
+                <div class="code">#{code}</div>
+              </div>
+              
+              <script>
+                // 同步倒计时显示
+                document.getElementById('countdown-text').innerText = secondsLeft;
+              </script>
+            </body>
+            </html>
+            HTML
+          else
+            puts "未获取到授权码"
+            res.content_type = "text/html; charset=UTF-8"
+            res.body = "未获取到授权码"
+          end
+
+          # 给用户更多时间看到页面内容，并让JavaScript倒计时完成
+          puts "4秒后关闭服务器..."
+          Thread.new do
+            sleep 4  # 设置为4秒，比JavaScript的3秒稍长一点，确保客户端有足够时间执行
+            server.shutdown
+          end
+        rescue => e
+          puts "处理请求时出错: #{e.class} - #{e.message}"
+          puts e.backtrace.join("\n")
+          
+          # 确保即使出错也返回有效的响应
+          res.content_type = "text/html; charset=UTF-8"
+          res.body = "处理请求时出错"
+          
+          # 出错时也关闭服务器
+          Thread.new do
+            sleep 4  # 与正常情况保持一致
+            server.shutdown
+          end
+        end
+      end
+      
+      # 捕获Ctrl+C以允许用户中断
+      trap('INT') { server.shutdown }
+      
+      # puts "正在监听http://localhost:8899等待飞书重定向..."
+      # puts "您也可以手动访问: http://localhost:8899/?code=YOUR_CODE&state=terminal_login"
+      
+      # 在线程中运行服务器，最多等待3分钟
+      thread = Thread.new { server.start }
+      begin
+        thread.join(180) # 最多等待3分钟
+      rescue Timeout::Error
+        puts "授权超时"
+        server.shutdown
+      end
+
+      if code
+        puts "成功获取授权码: #{code}"
+      else
+        puts "未获取到授权码"
+      end
+
+      code
+    end
+
+
+  end
+
+end

data/lib/pindo/client/pgyerclient.rb

@@ -1,9 +1,8 @@
-
 require 'uri'
 require 'pindo/base/aeshelper'
 require 'pindo/config/pindouserlocalconfig'
 require 'pindo/client/httpclient'
-
+require 'pindo/client/pgyer_feishu_oauth_cli'
 
 module Pindo
 
@@ -35,124 +34,44 @@ module Pindo
 
       end
 
-      def get_faraday_instance
-
-      end
-
-
       def do_login(force_login:false)
 
+        login_success = false
+        need_req_login = true
 
-
-          login_success = false
-          @token = load_token()
-          if !@token.nil? && !@token["token"].nil? && !force_login
-              login_success = true
-
-              # puts "用户#{@token["username"]}登录pgyer成功!!!"
-              # puts
-
-          else
-              username = nil
-              if !@token.nil? && !@token["username"].nil?
-                  username = @token["username"]
-                  checksum_password = nil
-                  if !@token["password"].nil?
-                    checksum_password = @token["password"]
-                  end
-              end
-              token = do_login_req(username:username, checksum_password:checksum_password)
-              if !token.nil? && !token["token"].nil?
-                  @token = token
-                  login_success = true
-              end
-          end
-
-          return login_success
-      end
-
-      def do_login_req(username:nil, checksum_password:nil)
-
-
-          login_name = username
-          if login_name.nil? || login_name.empty?
-              login_name = ask('请输入pgger网站的usernmae:') || nil
-          end
-
-          checksum_pass = checksum_password
-          if checksum_pass.nil? || checksum_pass.empty?
-              login_passwork = ask('请输入pgger网站的密码:') || nil
-              checksum_pass = Digest::MD5.hexdigest(login_passwork)
-          end
-
-        if !login_name.nil? && !login_name.empty? && !checksum_pass.nil? && !checksum_pass.empty?
-
+        if force_login
+            need_req_login = true
         else
-            raise Informative, "请输入正确的用户名和密码！"
-        end
-
-
-        Funlog.instance.fancyinfo_start("正在登录pgyer...")
-
-
-        result_data = do_send_code(username:login_name)
-
-
-          boss_url = @baseurl + @request_config["do_login"]
-          body_params = {
-              username:login_name,
-              phoneCode:result_data["msg"],
-              password:checksum_pass
-          }
-
-          # puts JSON.pretty_generate(body_params)
-
-          login_response_data = nil
-
-          begin
-
-        con = HttpClient.create_instance_with_proxy
-        res = con.post do |req|
-            req.url boss_url
-            req.headers['Content-Type'] = 'application/json'
-            req.body = body_params.to_json
+            @token = load_token()
+            if !@token.nil? && !@token["token"].nil? && !@token["username"].nil?
+                # 检查token是否已过期（超过7天）
+                if @token["expires_at"] && Time.now.to_i < @token["expires_at"]
+                    need_req_login = false
+                else
+                    Funlog.instance.fancyinfo_error("令牌已过期，需要重新登录...")
+                    login_success = true
+                end
+            else
+                need_req_login = true
+            end
         end
-
-        if !res.body.nil?
-
-            login_response_data = JSON.parse(res.body)
+        if need_req_login
+            login_handle = PgyerFeishuOAuthCLI.new("cli_a7db8213883ed00d")
+            result = login_handle.authorize
+            @token = {}
+            @token["token"] = login_handle.access_token
+            @token["username"] = login_handle.username
+            @token["expires_at"] = login_handle.expires_at
+            store_token(token:@token)
+            login_success = true
+        else
+            login_success = true
         end
 
-          rescue => error
-              Funlog.instance.fancyinfo_error("pgyer登录失败!")
-              puts "登录失败，请重试!!!"
-          end
-
-
-
-          # puts JSON.pretty_generate(login_response_data)
-
-          if !login_response_data.nil? && !login_response_data["code"].nil? && login_response_data["code"].to_s.eql?("200")
-
-              token = {}
-              token= login_response_data["data"]
-              token["password"] = checksum_pass
-              # puts JSON.pretty_generate(token)
-              store_token(token:token)
-
-              Funlog.instance.fancyinfo_success("用户:#{@token["username"]}登录pgyer成功!")
-
-          else
-              if File.exist?(@pgyer_token_file)
-                FileUtils.rm_rf(@pgyer_token_file)
-              end
-              Funlog.instance.fancyinfo_error("pgyer登录失败!")
-          end
-
-          return token
-
+        return login_success
       end
 
+
       def load_token()
 
           @token = nil
@@ -165,6 +84,12 @@ module Pindo
                 temp_token = data_string
                 temp_token = JSON.parse(data_string)
                 if !temp_token.nil? && !temp_token["token"].nil? && !temp_token["username"].nil?
+                    # 检查token是否已过期
+                    if temp_token["expires_at"] && Time.now.to_i > temp_token["expires_at"]
+                        Funlog.instance.fancyinfo_error("令牌已过期，需要重新登录...")
+                        return nil
+                    end
+                    
                     @token = temp_token
                     Funlog.instance.fancyinfo_success("读取pgyer token成功!")
                 end

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/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "5.0.5"
+  	VERSION = "5.0.7"
 
   	class VersionCheck
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.7
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -133,16 +133,22 @@ dependencies:
   name: faraday-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +189,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.4
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -207,30 +233,36 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
 description: easy work for deploy, dev
 email:
 - wade@gmail.com
@@ -258,6 +290,7 @@ files:
 - lib/pindo/client/feishuclient.rb
 - lib/pindo/client/giteeclient.rb
 - lib/pindo/client/httpclient.rb
+- lib/pindo/client/pgyer_feishu_oauth_cli.rb
 - lib/pindo/client/pgyerclient.rb
 - lib/pindo/client/pgyeruploadclient.rb
 - lib/pindo/client/tgateclient.rb