jpsclient 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2afd23d09740af2160dbbfc2c6c1f0cffb937b5da3ab905c29582d0738eeb1
-  data.tar.gz: 6dacc82e06e921343226aca9a2277ea7a5a6f2c43f949fc46f4cbdc5136ba1ad
+  metadata.gz: 964eac6cd5b6f4c45e0dc0533a7a2bd68eb1363132b25314e394f5234a09d978
+  data.tar.gz: 70124f395973eddec1d62e66230ad9584c2ab841d14ac8f99ddf903fb88505a7
 SHA512:
-  metadata.gz: b9b0002b6139c3b5d83dc4afcb9d4c185e4009205845db11fecbc06429cf4b588d7557bf71f1a648465f20532e2915f3d3a3939b4fec6209b6b57f862f4715b6
-  data.tar.gz: 0ab8ae8afd9e9db0a5a508a8ce2c4a6f2ba5552906506f05168ac6d053140ffda61f62c15d7de8599438d9b62c03d63018a8aa98940ede6e7921201ffc0aadb0
+  metadata.gz: aae1920afcce6295fd8589d9b8c6d91186dab110b58883de449ab467ea27c553bdee976b3d03145a152b82e1bd4327110135ab87b536f59c90b6f312093b9f16
+  data.tar.gz: 249f21c49c4838fdbafce3b5047aa97215f94caff834dde2c0ca4ba3fb75eb22d2eaeaafc7cd7bc6de4119ea86597a3646d65cc91840c1b3ddf79ff611cc8ffa

data/lib/jpsclient/api/commit_log.rb

@@ -42,7 +42,8 @@ module JPSClient
       # @param workflowId [Integer] 工作流ID（必需）
       # @param params [Hash] 其他参数
       # @option params [Boolean] :single 是否单个提交（默认 true）
-      # @option params [Array<String>] :branches 分支名称数组
+      # @option params [String] :branch 分支名称（单数形式）
+      # @option params [Array<String>] :branches 分支名称数组（向后兼容）
       # @option params [Array<String>] :commitIds 提交ID数组
       # @option params [Integer] :startTimestamp 开始时间戳
       # @option params [Integer] :endTimestamp 结束时间戳
@@ -60,7 +61,8 @@ module JPSClient
         }
 
         # 添加可选参数
-        body_params[:branches] = params[:branches] if params[:branches]
+        body_params[:branch] = params[:branch] if params[:branch]               # 支持单数形式
+        body_params[:branches] = params[:branches] if params[:branches]         # 向后兼容复数形式
         body_params[:commitIds] = params[:commitIds] if params[:commitIds]
         body_params[:startTimestamp] = params[:startTimestamp] if params[:startTimestamp]
         body_params[:endTimestamp] = params[:endTimestamp] if params[:endTimestamp]

data/lib/jpsclient/http/http_client.rb

@@ -1,8 +1,77 @@
 require 'json'
 require 'faraday'
-require 'faraday/retry'
+require 'typhoeus'
+require 'typhoeus/adapters/faraday'
 
 module JPSClient
+  # 简单的 Faraday 重试中间件（替代 faraday-retry）
+  class SimpleRetryMiddleware < Faraday::Middleware
+    # 默认幂等的 HTTP 方法（可安全重试）
+    IDEMPOTENT_METHODS = [:get, :head, :put, :delete, :options, :trace].freeze
+    # 可重试的 HTTP 状态码（5xx 服务器错误）
+    RETRIABLE_STATUS_CODES = (500..599).freeze
+
+    def initialize(app, options = {})
+      super(app)
+      @max = options[:max] || 3  # 最大重试次数（不包括首次尝试）
+      @interval = options[:interval] || 0.5
+      @backoff_factor = options[:backoff_factor] || 2
+      @interval_randomness = options[:interval_randomness] || 0.5
+      @exceptions = options[:exceptions] || [Faraday::TimeoutError, Faraday::ConnectionFailed]
+      @methods = options[:methods] || IDEMPOTENT_METHODS  # 允许重试的 HTTP 方法
+      @retry_statuses = options[:retry_statuses] || RETRIABLE_STATUS_CODES
+    end
+
+    def call(env)
+      retries = 0
+
+      loop do
+        begin
+          response = @app.call(env)
+
+          # 检查 HTTP 状态码是否需要重试（5xx 错误）
+          # 同时必须满足幂等性要求，避免非幂等请求（如 POST）被意外重试
+          if retriable_response?(response) && retriable_request?(env) && retries < @max
+            retries += 1
+            sleep_with_jitter(retries)
+            next  # 继续下一次循环（重试）
+          end
+
+          return response  # 成功，返回响应
+
+        rescue *@exceptions => e
+          # 检查是否为幂等方法，非幂等方法不自动重试
+          if retriable_request?(env) && retries < @max
+            retries += 1
+            sleep_with_jitter(retries)
+            next  # 继续下一次循环（重试）
+          else
+            raise e  # 不能重试，抛出异常
+          end
+        end
+      end
+    end
+
+    private
+
+    # 检查请求是否可重试（幂等性检查）
+    def retriable_request?(env)
+      @methods.include?(env[:method])
+    end
+
+    # 检查响应是否需要重试（5xx 状态码）
+    def retriable_response?(response)
+      @retry_statuses.include?(response.status)
+    end
+
+    # 指数退避 + 随机抖动
+    def sleep_with_jitter(retry_count)
+      sleep_time = @interval * (@backoff_factor ** (retry_count - 1))
+      jitter = rand * sleep_time * @interval_randomness
+      sleep(sleep_time + jitter)
+    end
+  end
+
   # JPS 专用 HTTP 客户端 - 优化版
   class HttpClient
     attr_accessor :base_url
@@ -93,8 +162,8 @@ module JPSClient
     # 获取或创建连接（复用连接）
     def connection
       @connection ||= Faraday.new do |config|
-        # 重试配置
-        config.request :retry, {
+        # 使用自定义重试中间件（替代 faraday-retry）
+        config.use SimpleRetryMiddleware, {
           max: @max_retry_times,
           interval: 0.5,
           backoff_factor: 2,
@@ -111,7 +180,8 @@ module JPSClient
           }.compact
         end
 
-        config.adapter Faraday.default_adapter
+        # 使用 Typhoeus 适配器（高性能 HTTP 客户端）
+        config.adapter :typhoeus
       end
     end
 

data/lib/jpsclient/upload/upload_config.rb

@@ -5,8 +5,6 @@ module JPSClient
   class UploadConfig
     attr_accessor :region
     attr_accessor :bucket_name
-    attr_accessor :access_key_id
-    attr_accessor :access_key_secret
     attr_accessor :default_url
     attr_accessor :attach_url
     attr_accessor :upload_type         # 上传类型
@@ -21,8 +19,6 @@ module JPSClient
     def initialize(
       region: nil,
       bucket_name: nil,
-      access_key_id: nil,
-      access_key_secret: nil,
       default_url: nil,
       attach_url: nil,
       upload_type: nil,
@@ -36,8 +32,6 @@ module JPSClient
     )
       @region = region
       @bucket_name = bucket_name
-      @access_key_id = access_key_id
-      @access_key_secret = access_key_secret
       @default_url = default_url
       @attach_url = attach_url
       @upload_type = upload_type
@@ -60,8 +54,6 @@ module JPSClient
       new(
         region: json_config['region'] || "ap-southeast-1",
         bucket_name: json_config['bucket_name'] || "pgy-resource-new",
-        access_key_id: json_config['access_key_id'],
-        access_key_secret: json_config['access_key_secret'],
         default_url: json_config['default_url'] || "resource/",
         attach_url: json_config['attach_url'] || "attach_file/",
         upload_type: json_config['upload_type'] || "s3",
@@ -114,9 +106,11 @@ module JPSClient
     end
 
     # 验证配置完整性
+    # 注意：移除了对 access_key_id 和 access_key_secret 的验证
+    # 因为客户端使用预签名 URL，不直接使用 AWS 凭证
+    # AWS 凭证由 JPS 服务器端管理
     def valid?
       !@region.nil? && !@bucket_name.nil? &&
-      !@access_key_id.nil? && !@access_key_secret.nil? &&
       !@default_url.nil? && !@attach_url.nil?
     end
 
@@ -130,8 +124,6 @@ module JPSClient
       {
         'region' => @region,
         'bucket_name' => @bucket_name,
-        'access_key_id' => @access_key_id,
-        'access_key_secret' => @access_key_secret,
         'default_url' => @default_url,
         'attach_url' => @attach_url,
         'upload_type' => @upload_type,

data/lib/jpsclient/version.rb

@@ -1,3 +1,3 @@
 module JPSClient
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpsclient
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Your Name
@@ -29,26 +29,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: faraday-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -303,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: JPS Platform API Client with Full API Support
 test_files: []