jpsclient 2.7.2 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b469c45fc263d9c573736eba519b34ae855058e47b77a01428e5da3330ce052
-  data.tar.gz: cc4eb5ab5180c02022dff9df585d848cf51c1fab8914b0e129989b812501133b
+  metadata.gz: b7014fe7a27b5b18567a2026f0df7f02efc5cb41fd9756e031377f8d7af74d65
+  data.tar.gz: e0e02d786ede3bdb12b5d5f4d42f4a65d9414420835de19230b638be24f4bc66
 SHA512:
-  metadata.gz: 0bfbf38a960e5b308f72b28e0962eebb0425fec3a15229c77f8a01b17353012fb988db35f47363cdea5ca57151a317c09b07e9ba999019fdff2ee7c940cb8aef
-  data.tar.gz: e8952174c4e5921e3cb7dad0e98c0f72f466aac458b50342eefabf82fc4f87727610bb303dc4b6a4d454fd41cc64739455aafc2c2ace2bde5f68733bd9c5e7f9
+  metadata.gz: ed31e0a4b90af88a0a21596ea29aaa29442be00defb71bc90a05b750bc9d304cbf08aec40dab57d9fcbc20f50ddeabb013564cdfc0273ff3d009fc7ae44768e8
+  data.tar.gz: 7573c0e55b1be5fa61290621f678cfc038e617919407b0b4e1e0d81d31fea909fd6adb31b867ebf77f03d4bcf647bf4c269883716cae501a7344a1d55a6f3f4a

data/lib/jpsclient/api/commit_log.rb

@@ -27,18 +27,21 @@ module JPSClient
         return request_with_auth(:post, path, body: body_params)
       end
 
-      # 发送提交记录消息通知
+      # 发送提交记录消息通知（commit_log/send_message）
+      #
+      # 以线上真实请求为准：接口文档可能滞后。
       #
       # @param projectId [String] 项目ID（必需）
       # @param workflowId [Integer] 工作流ID（必需）
       # @param params [Hash] 其他参数
-      # @option params [Boolean] :single 是否单个提交（默认 true）
-      # @option params [Array<String>, String] :branches 分支名称数组，服务端 CommitLogSendMessageDto 的字段
-      # @option params [String] :branch 分支名称（单数形式，调用方便利写法，内部归一化为 branches）
-      # @option params [Array<String>] :commitIds 提交ID数组
-      # @option params [Integer] :startTimestamp 开始时间戳
-      # @option params [Integer] :endTimestamp 结束时间戳
-      # @option params [Integer] :indexNo 索引号
+      # @option params [Boolean] :single 是否单条提交发送（默认 true）
+      # @option params [Array<Integer>] :ids commit_log 记录 ID 集合
+      # @option params [String] :branch 分支名称，空字符串也需要原样发送
+      # @option params [Array<String>] :commitIds 提交ID集合，single=true 时必传（取第一个）
+      # @option params [Integer] :startTimestamp 提交时间下界（epoch 毫秒，闭区间，仅 single=false）
+      # @option params [Integer] :endTimestamp 提交时间上界（epoch 毫秒，开区间，仅 single=false）
+      # @option params [Integer] :indexNo 项目包索引号
+      # @option params [Array<String>] :repoTypes 仓库类型过滤（仅 single=false）
       # @return [Hash] API响应
       def send_commit_log_message(projectId:, workflowId:, params: {})
         config = @request_config && @request_config["commit_log_send_message"]
@@ -51,16 +54,13 @@ module JPSClient
           single: params.fetch(:single, true)
         }
 
-        # 添加可选参数
-        # 服务端 CommitLogSendMessageDto 只有 branches 数组字段，branch 单数会被直接丢弃，
-        # 因此单数写法在这里归一化为数组，不再原样透传
-        branches = params[:branches] || params[:branch]
-        body_params[:branches] = Array(branches).compact if branches
-
+        body_params[:ids] = params[:ids] if params[:ids]
         body_params[:commitIds] = params[:commitIds] if params[:commitIds]
+        body_params[:branch] = params[:branch] if params.key?(:branch)
         body_params[:startTimestamp] = params[:startTimestamp] if params[:startTimestamp]
         body_params[:endTimestamp] = params[:endTimestamp] if params[:endTimestamp]
         body_params[:indexNo] = params[:indexNo] if params[:indexNo]
+        body_params[:repoTypes] = params[:repoTypes] if params[:repoTypes]
 
         return request_with_auth(:post, path, body: body_params)
       end

data/lib/jpsclient/api/file.rb

@@ -6,7 +6,10 @@ module JPSClient
 
       # 初始化多部分上传
       def init_file_multipart(s3_key:, content_type: "", upload_config:)
-        path = @request_config["file_init_multipart"]["url"]
+        config = @request_config && @request_config["file_init_multipart"]
+        raise JPSClient::ExceptionError, "Missing config for file_init_multipart" unless config && config["url"]
+
+        path = config["url"]
 
         body_params = {
         s3Key: s3_key,
@@ -24,7 +27,10 @@ module JPSClient
       # @param upload_config [UploadConfig] 上传配置
       # @return [Hash] 包含预签名URL的响应
       def get_simple_sign_url(s3_key:, upload_config:)
-        path = @request_config["file_sign_url"]["url"]
+        config = @request_config && @request_config["file_sign_url"]
+        raise JPSClient::ExceptionError, "Missing config for file_sign_url" unless config && config["url"]
+
+        path = config["url"]
 
         body_params = {
         s3Key: s3_key,
@@ -38,7 +44,10 @@ module JPSClient
 
       # 获取分片预签名URL
       def get_file_sign_url(s3_key:, upload_id:, part_id:, upload_config:)
-        path = @request_config["file_sign_url"]["url"]
+        config = @request_config && @request_config["file_sign_url"]
+        raise JPSClient::ExceptionError, "Missing config for file_sign_url" unless config && config["url"]
+
+        path = config["url"]
 
         body_params = {
         s3Key: s3_key,
@@ -54,7 +63,10 @@ module JPSClient
 
       # 完成多部分上传
       def complete_file_multipart(s3_key:, upload_id:, upload_config:)
-        path = @request_config["file_complete_multipart"]["url"]
+        config = @request_config && @request_config["file_complete_multipart"]
+        raise JPSClient::ExceptionError, "Missing config for file_complete_multipart" unless config && config["url"]
+
+        path = config["url"]
 
         body_params = {
         s3Key: s3_key,

data/lib/jpsclient/api/project_package.rb

@@ -61,7 +61,6 @@ module JPSClient
       # @option params [String] :projectPackageId 项目包ID
       # @return [Hash] API响应
       def upload_nuget_package(projectId:nil, params:nil)
-        puts "========1111 upload_nuget_package"  if JPSClient.debug?
         config = @request_config && @request_config["project_package_upload_nuget"]
         raise JPSClient::ExceptionError, "Missing config for project_package_upload_nuget" unless config && config["url"]
         path = config["url"]

data/lib/jpsclient/upload/upload_client.rb

@@ -79,6 +79,8 @@ module JPSClient
         puts "文件路径: #{@upload_binary_file}"
         puts "文件大小: #{total_mb}M"
         puts "上传路径: #{s3_key}"
+        puts "存储桶: #{@upload_config.bucket_name}"
+        puts "区域: #{@upload_config.region}"
         puts
         puts "切片大小: #{@upload_config.chunk_size_mb}MB"
 
@@ -98,12 +100,11 @@ module JPSClient
             puts "[JPS_DEBUG] init_file_multipart 返回: #{init_result.inspect}"
           end
 
-          if init_result.nil? || !init_result.dig("data", "upload_id")
+          upload_id = multipart_upload_id(init_result)
+          if init_result.nil? || upload_id.nil?
               raise ExceptionError, init_multipart_error_message(init_result)
           end
 
-          upload_id = init_result["data"]["upload_id"]
-
           # 准备分片任务队列
           @tasks_queue = Queue.new
           @worker_threads = []
@@ -150,7 +151,7 @@ module JPSClient
 
           if complete_result && (complete_result["code"] == 0 || complete_result["code"] == 200)
               # 返回 URL 字符串以保持向后兼容
-              upload_result = complete_result.dig("data", "url") || s3_key
+              upload_result = uploaded_file_url(complete_result, s3_key)
               Logger.instance.fancyinfo_success("文件#{@upload_binary_file} 上传成功! 😎😎😎")
           else
               upload_result = nil
@@ -323,13 +324,13 @@ module JPSClient
               upload_config: @upload_config
           )
 
-          if sign_result.nil? || !sign_result.dig("data", "url")
+          original_url = signed_upload_url(sign_result)
+          if original_url.nil?
               # Logger.instance.info("分片 ##{part_no} 获取上传URL失败")  # 避免打断进度条
               handle_retry(upload_params_item, "获取上传URL失败")
               return
           end
 
-          original_url = sign_result["data"]["url"]
           upload_url = original_url
 
           # 如果启用 Cloudflare 加速，转换 URL
@@ -431,13 +432,34 @@ module JPSClient
           end
       end
 
-      def calculate_chunk_timeout(chunk_size)
-          # 使用配置的 timeout_seconds 作为单个分片的超时时间
-          # 默认600秒（10分钟）
-          @upload_config.timeout_seconds || 600
-      end
+	      def calculate_chunk_timeout(chunk_size)
+	          # 使用配置的 timeout_seconds 作为单个分片的超时时间
+	          # 默认600秒（10分钟）
+	          @upload_config.timeout_seconds || 600
+	      end
+
+        def multipart_upload_id(init_result)
+          init_result&.dig("data", "upload_id") || init_result&.dig("data", "uploadId")
+        end
+
+        def signed_upload_url(sign_result)
+          data = sign_result&.dig("data")
+          return nil unless data.is_a?(Hash)
+
+          data["url"] || data["signUrl"] || data["sign_url"] ||
+            data["apiGatewayUrl"] || data["api_gateway_url"]
+        end
+
+        def uploaded_file_url(complete_result, s3_key)
+          data = complete_result&.dig("data")
+          return s3_key unless data.is_a?(Hash)
+
+          data["url"] || data["httpUrl"] || data["http_url"] ||
+            data["apiGatewayUrl"] || data["api_gateway_url"] ||
+            data["s3Url"] || data["s3_url"] || s3_key
+        end
 
-      def handle_retry(upload_params_item, error_reason)
+	      def handle_retry(upload_params_item, error_reason)
           part_no = upload_params_item["partNo"]
           @progress_bar.delete_upload_index(upload_part:part_no)
 

data/lib/jpsclient/upload/upload_media_client.rb

@@ -241,13 +241,12 @@ module JPSClient
         upload_config: @upload_config
       )
 
-      unless sign_result && sign_result.dig("data", "url")
+      upload_url = signed_upload_url(sign_result)
+      unless upload_url
         handle_retry(task_item, "获取预签名 URL 失败")
         return
       end
 
-      upload_url = sign_result["data"]["url"]
-
       # 读取文件
       begin
         file_content = File.binread(file_path)
@@ -276,8 +275,7 @@ module JPSClient
       response = request.run
 
       if response.success?
-        # 构建文件访问 URL
-        file_url = "https://#{@upload_config.media_bucket_name}.s3.#{@upload_config.media_region}.amazonaws.com/#{s3_key}"
+        file_url = uploaded_media_url(sign_result, s3_key)
 
         # 记录成功结果
         @results_mutex.synchronize do
@@ -348,6 +346,34 @@ module JPSClient
       [[calculated, 30].max, 300].min
     end
 
+    def signed_upload_url(sign_result)
+      data = sign_result&.dig("data")
+      return nil unless data.is_a?(Hash)
+
+      data["url"] || data["signUrl"] || data["sign_url"] ||
+        data["apiGatewayUrl"] || data["api_gateway_url"]
+    end
+
+    def uploaded_media_url(sign_result, s3_key)
+      data = sign_result&.dig("data")
+      if data.is_a?(Hash)
+        url = data["fileUrl"] || data["file_url"] ||
+              data["staticUrl"] || data["static_url"] ||
+              data["httpUrl"] || data["http_url"] ||
+              data["url"]
+        return url unless url.to_s.empty?
+      end
+
+      "#{static_base_url}/#{s3_key}"
+    end
+
+    def static_base_url
+      bucket_name = @upload_config.media_bucket_name.to_s
+      return "https://jps-static.devtestapp.com" if bucket_name == "jps-resource"
+
+      "https://pgy-static.devtestapp.com"
+    end
+
     # 检查是否上传失败
     def upload_failed?
       @upload_failed_mutex.synchronize { @upload_failed }

data/lib/jpsclient/version.rb

@@ -1,3 +1,3 @@
 module JPSClient
-  VERSION = '2.7.2'
+  VERSION = '2.7.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpsclient
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.5
 platform: ruby
 authors:
 - Your Name