jpsclient 2.7.5 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7014fe7a27b5b18567a2026f0df7f02efc5cb41fd9756e031377f8d7af74d65
-  data.tar.gz: e0e02d786ede3bdb12b5d5f4d42f4a65d9414420835de19230b638be24f4bc66
+  metadata.gz: 0d61ea8f97063390fa28c05be9b39979a18f9eb671aead52d2f075f9be04ee8c
+  data.tar.gz: 05f18f0cb982cca4bc27233aaef5cdf2456138723de40ab3d89ea5909995b0b1
 SHA512:
-  metadata.gz: ed31e0a4b90af88a0a21596ea29aaa29442be00defb71bc90a05b750bc9d304cbf08aec40dab57d9fcbc20f50ddeabb013564cdfc0273ff3d009fc7ae44768e8
-  data.tar.gz: 7573c0e55b1be5fa61290621f678cfc038e617919407b0b4e1e0d81d31fea909fd6adb31b867ebf77f03d4bcf647bf4c269883716cae501a7344a1d55a6f3f4a
+  metadata.gz: 45ce3c0e73d8384391fece49e0b8256697a99b371aa98859fd6e649baadd527a32ccf1af93b4db14545f7a769000f9484d629bd908bf4382656977bea70026b7
+  data.tar.gz: 6612908940d4ce6a89e4503b9cf54529fcbb9a9d9c1bb5f6dd4a51814ab8c41aee69165cf25e56d612bfa68dadbb3892044504c666299f461ad13ee92024689e

data/lib/jpsclient/api/file.rb

@@ -23,10 +23,15 @@ module JPSClient
       end
 
       # 获取简单上传预签名URL（用于小文件直接上传，使用 media 配置）
+      #
+      # 传了 contentType 时服务端会把 content-type 纳入签名（X-Amz-SignedHeaders 含
+      # content-type），调用方 PUT 时必须发送完全相同的值，否则 S3 返回 403
+      #
       # @param s3_key [String] S3 文件路径
+      # @param content_type [String] 文件 Content-Type，决定对象最终类型
       # @param upload_config [UploadConfig] 上传配置
       # @return [Hash] 包含预签名URL的响应
-      def get_simple_sign_url(s3_key:, upload_config:)
+      def get_simple_sign_url(s3_key:, content_type: "", upload_config:)
         config = @request_config && @request_config["file_sign_url"]
         raise JPSClient::ExceptionError, "Missing config for file_sign_url" unless config && config["url"]
 
@@ -34,6 +39,7 @@ module JPSClient
 
         body_params = {
         s3Key: s3_key,
+        contentType: content_type,
         uploadType: upload_config.upload_type,
         bucketName: upload_config.media_bucket_name,
         region: upload_config.media_region
@@ -43,7 +49,9 @@ module JPSClient
       end
 
       # 获取分片预签名URL
-      def get_file_sign_url(s3_key:, upload_id:, part_id:, upload_config:)
+      #
+      # @param content_type [String] 文件 Content-Type，与 init_file_multipart 保持一致
+      def get_file_sign_url(s3_key:, upload_id:, part_id:, content_type: "", upload_config:)
         config = @request_config && @request_config["file_sign_url"]
         raise JPSClient::ExceptionError, "Missing config for file_sign_url" unless config && config["url"]
 
@@ -51,6 +59,7 @@ module JPSClient
 
         body_params = {
         s3Key: s3_key,
+        contentType: content_type,
         uploadType: upload_config.upload_type,
         uploadId: upload_id,
         partId: part_id,

data/lib/jpsclient/upload/upload_client.rb

@@ -10,6 +10,7 @@ require 'jpsclient/http/http_client'
 require 'jpsclient/upload/upload_config'
 require 'jpsclient/upload/upload_progress'
 require 'jpsclient/utils/logger'
+require 'jpsclient/utils/content_type'
 
 module JPSClient
 
@@ -20,8 +21,12 @@ module JPSClient
       attr_accessor :file_size
       attr_accessor :progress_bar
       attr_reader :jps_client
+      attr_reader :s3_key   # 本次上传使用的 S3 Key，供调用方自行拼装访问地址
 
-      def initialize(jps_client)
+      # @param jps_client [Client] JPS 客户端实例
+      # @param upload_config [UploadConfig, nil] 上传配置，传入时覆盖客户端配置。
+      #   媒体大文件走分片上传时由 UploadMediaClient 注入 media 桶配置
+      def initialize(jps_client, upload_config: nil)
           raise ExceptionError, "必须提供 Client 实例" unless jps_client
 
           @jps_client = jps_client
@@ -30,7 +35,7 @@ module JPSClient
           config_json = @jps_client.config_json
 
           # 加载上传配置
-          @upload_config = UploadConfig.from_json(config_json["upload_config"])
+          @upload_config = upload_config || UploadConfig.from_json(config_json["upload_config"])
           unless @upload_config && @upload_config.valid?
             raise ExceptionError, "上传配置无效或不完整"
           end
@@ -66,6 +71,7 @@ module JPSClient
         # 使用配置中的路径前缀
         path_prefix = isAttach ? @upload_config.attach_url : @upload_config.default_url
         s3_key = "#{path_prefix}#{file_uuid}#{extension}"
+        @s3_key = s3_key
 
         # 计算文件大小和分片信息
         total_mb = sprintf("%.2f", @file_size / 1024.0 / 1024.0)
@@ -86,12 +92,29 @@ module JPSClient
 
         upload_result = nil
 
+        # contentType 决定 CreateMultipartUpload 后对象的最终类型，按扩展名推导，
+        # 让 apk/zip 等安装包不再一律落成 application/octet-stream。
+        # 分片 PUT 也发同一个值：预签名 URL 若把 content-type 纳入签名，两边不一致会 403
+        @content_type = ContentType.for_file(@upload_binary_file)
+        content_type = @content_type
+
+        if JPSClient.debug?
+          puts [
+            "[JPS_DEBUG] 分片上传参数: #{filename}",
+            "[JPS_DEBUG]   s3Key:       #{s3_key}",
+            "[JPS_DEBUG]   bucketName:  #{@upload_config.bucket_name}",
+            "[JPS_DEBUG]   region:      #{@upload_config.region}",
+            "[JPS_DEBUG]   uploadType:  #{@upload_config.upload_type}",
+            "[JPS_DEBUG]   contentType: #{content_type}"
+          ].join("\n")
+        end
+
         begin
           # 步骤1: 初始化多部分上传
           Logger.instance.fancyinfo_start("初始化上传...")
           init_result = @jps_client.init_file_multipart(
               s3_key: s3_key,
-              content_type: "",
+              content_type: content_type,
               upload_config: @upload_config
           )
 
@@ -321,6 +344,7 @@ module JPSClient
               s3_key: s3_key,
               upload_id: upload_id,
               part_id: part_no,
+              content_type: @content_type.to_s,
               upload_config: @upload_config
           )
 
@@ -381,7 +405,7 @@ module JPSClient
               method: :put,
               body: put_data,
               headers: {
-                  'Content-Type' => 'application/octet-stream',
+                  'Content-Type' => @content_type || ContentType::DEFAULT,
                   'Content-Length' => read_length.to_s
               },
               timeout: chunk_timeout,

data/lib/jpsclient/upload/upload_config.rb

@@ -105,6 +105,30 @@ module JPSClient
       return 5
     end
 
+    # 返回一份把 media_* 提升为主字段的副本
+    #
+    # 分片上传链路（init_multipart / sign_url / complete_multipart）统一读
+    # bucket_name / region / default_url，媒体大文件要落到 media 桶，就用这份视图，
+    # 而不是就地改写配置，避免影响同一进程里的安装包上传
+    #
+    # @return [UploadConfig] 新的配置实例，原实例不变
+    def to_media_config
+      self.class.new(
+        region: @media_region,
+        bucket_name: @media_bucket_name,
+        default_url: @media_default_url,
+        attach_url: @attach_url,
+        upload_type: @upload_type,
+        concurrent_workers: @concurrent_workers,
+        chunk_size_mb: @chunk_size_mb,
+        max_retry_times: @max_retry_times,
+        timeout_seconds: @timeout_seconds,
+        media_region: @media_region,
+        media_bucket_name: @media_bucket_name,
+        media_default_url: @media_default_url
+      )
+    end
+
     # 验证配置完整性
     # 注意：移除了对 access_key_id 和 access_key_secret 的验证
     # 因为客户端使用预签名 URL，不直接使用 AWS 凭证

data/lib/jpsclient/upload/upload_media_client.rb

@@ -4,6 +4,7 @@ require 'thread'
 require 'jpsclient/base/exception'
 require 'jpsclient/upload/upload_config'
 require 'jpsclient/utils/logger'
+require 'jpsclient/utils/content_type'
 
 module JPSClient
   # Media 文件上传客户端
@@ -90,38 +91,13 @@ module JPSClient
       @upload_failed = false
       @upload_results = []
 
-      # 准备任务队列
-      @tasks_queue = Queue.new
-      @worker_threads = []
-      @expected_files = valid_files.size
-      @active_tasks = 0
-
-      # 获取并发和重试配置
-      concurrent_workers = [@upload_config.concurrent_workers, valid_files.size].min
-      retry_count = @upload_config.max_retry_times
-
-      puts "准备上传 #{valid_files.size} 个文件"
-      puts "并发上传线程数: #{concurrent_workers}"
-      puts "失败重试次数: #{retry_count}"
-      puts
-
-      # 创建文件上传任务
-      valid_files.each do |file_path|
-        task_item = {
-          "file_path" => file_path,
-          "retry_count" => retry_count
-        }
-        @tasks_queue.push(task_item)
-      end
-
-      # 开始并发上传
-      Logger.instance.fancyinfo_start("开始上传...")
+      # 按分片大小分流：装不满一个分片的文件一次 PUT 传完，超出的走分片上传
+      # 大文件不并发，是因为分片上传自身已经并发传分片，再套一层会让线程数和进度条都失控
+      chunk_size = @upload_config.chunk_size_bytes
+      small_files, large_files = valid_files.partition { |f| File.size(f) <= chunk_size }
 
-      begin
-        concurrent_upload(concurrency: concurrent_workers)
-      ensure
-        cleanup_worker_threads
-      end
+      upload_small_files(small_files) if small_files.any?
+      large_files.each { |file_path| upload_large_file(file_path) }
 
       # 收集结果
       @upload_results.each do |item|
@@ -159,6 +135,86 @@ module JPSClient
 
     private
 
+    # 并发简单上传（单个分片装得下的文件）
+    #
+    # @param file_paths [Array<String>] 文件路径列表
+    def upload_small_files(file_paths)
+      @tasks_queue = Queue.new
+      @worker_threads = []
+      @expected_files = file_paths.size
+      @active_tasks = 0
+
+      concurrent_workers = [@upload_config.concurrent_workers, file_paths.size].min
+      retry_count = @upload_config.max_retry_times
+
+      puts "准备上传 #{file_paths.size} 个文件"
+      puts "并发上传线程数: #{concurrent_workers}"
+      puts "失败重试次数: #{retry_count}"
+      puts
+
+      file_paths.each do |file_path|
+        @tasks_queue.push("file_path" => file_path, "retry_count" => retry_count)
+      end
+
+      Logger.instance.fancyinfo_start("开始上传...")
+
+      begin
+        concurrent_upload(concurrency: concurrent_workers)
+      ensure
+        cleanup_worker_threads
+      end
+    end
+
+    # 分片上传单个大文件（超过 chunk_size_mb 的文件）
+    #
+    # 复用安装包的分片链路（init_multipart / sign_url / complete_multipart），
+    # 但注入 media 桶配置，保证媒体文件仍然落在 media 桶、走 media 静态域名
+    #
+    # @param file_path [String] 文件路径
+    def upload_large_file(file_path)
+      file_name = File.basename(file_path)
+      puts "分片上传大文件: #{file_name}（#{(File.size(file_path) / 1024.0 / 1024.0).round(1)}MB）"
+
+      client = UploadClient.new(@jps_client, upload_config: @upload_config.to_media_config)
+
+      url = begin
+        client.upload_file(binary_file: file_path)
+      rescue => e
+        Logger.instance.fancyinfo_error("#{file_name} 分片上传异常: #{e.message}")
+        nil
+      end
+
+      if url.to_s.empty?
+        @results_mutex.synchronize do
+          @upload_results << {
+            "file_path" => file_path,
+            "url" => nil,
+            "success" => false,
+            "error" => "分片上传失败"
+          }
+        end
+        puts "  ❌ #{file_name}"
+        return
+      end
+
+      # complete 可能回退成 s3Key，也可能返回带 X-Amz-Signature 的预签名地址（30 分钟过期）。
+      # 这两种都不能写进 JPS 提交记录，统一改用媒体静态域名 + s3Key
+      unless static_media_url?(url)
+        url = "#{static_base_url}/#{client.s3_key.to_s.sub(%r{\A/}, '')}"
+      end
+
+      @results_mutex.synchronize do
+        @upload_results << {
+          "file_path" => file_path,
+          "url" => url,
+          "success" => true,
+          "error" => nil
+        }
+      end
+
+      puts "  ✅ #{file_name}"
+    end
+
     # 并发上传控制
     def concurrent_upload(concurrency: 1)
       @worker_threads = []
@@ -235,9 +291,16 @@ module JPSClient
       extension = File.extname(file_path)
       s3_key = "#{@upload_config.media_default_url}#{file_uuid}#{extension}"
 
+      # Content-Type 按扩展名推导，并跟着签名请求一起发给服务端：
+      # 服务端会把它纳入签名，下面 PUT 时必须发送同一个值
+      content_type = ContentType.for_file(file_path)
+
+      debug_print_upload_params(file_name, s3_key, content_type)
+
       # 获取预签名 URL
       sign_result = @jps_client.get_simple_sign_url(
         s3_key: s3_key,
+        content_type: content_type,
         upload_config: @upload_config
       )
 
@@ -265,7 +328,7 @@ module JPSClient
         method: :put,
         body: file_content,
         headers: {
-          'Content-Type' => 'application/octet-stream',
+          'Content-Type' => content_type,
           'Content-Length' => file_size.to_s
         },
         timeout: timeout,
@@ -298,6 +361,21 @@ module JPSClient
       end
     end
 
+    # 调试模式（JPS_DEBUG）下打印本次上传使用的 S3 参数
+    # 并发上传时逐行 puts 会互相穿插，这里一次性输出整块
+    def debug_print_upload_params(file_name, s3_key, content_type)
+      return unless JPSClient.debug?
+
+      puts [
+        "[JPS_DEBUG] media 上传参数: #{file_name}",
+        "[JPS_DEBUG]   s3Key:       #{s3_key}",
+        "[JPS_DEBUG]   bucketName:  #{@upload_config.media_bucket_name}",
+        "[JPS_DEBUG]   region:      #{@upload_config.media_region}",
+        "[JPS_DEBUG]   uploadType:  #{@upload_config.upload_type}",
+        "[JPS_DEBUG]   contentType: #{content_type}"
+      ].join("\n")
+    end
+
     # 处理重试
     def handle_retry(task_item, error_reason)
       file_path = task_item["file_path"]
@@ -346,21 +424,33 @@ module JPSClient
       [[calculated, 30].max, 300].min
     end
 
+    # 是否是可以长期访问的地址：必须是 http 开头且不带 S3 预签名参数
+    def static_media_url?(url)
+      value = url.to_s
+      value.start_with?("http") && !value.include?("X-Amz-Signature")
+    end
+
+    # 取预签名 PUT 地址：sign_url 返回的 url 才带 X-Amz-Signature，
+    # api_gateway_url 是上传完成后的静态访问地址，PUT 到它上面必然失败
     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"]
+      data["url"] || data["signUrl"] || data["sign_url"]
     end
 
+    # 取上传完成后的访问地址，用于写回 JPS 提交记录
+    #
+    # 优先 api_gateway_url：sign_url 返回的静态域名地址就是给上传后更新数据用的。
+    # 这里绝不能回退到 data["url"]，那是带 X-Amz-Signature 且 30 分钟过期的预签名地址，
+    # 写进 commit_log 后链接很快失效
     def uploaded_media_url(sign_result, s3_key)
       data = sign_result&.dig("data")
       if data.is_a?(Hash)
-        url = data["fileUrl"] || data["file_url"] ||
+        url = data["apiGatewayUrl"] || data["api_gateway_url"] ||
+              data["fileUrl"] || data["file_url"] ||
               data["staticUrl"] || data["static_url"] ||
-              data["httpUrl"] || data["http_url"] ||
-              data["url"]
+              data["httpUrl"] || data["http_url"]
         return url unless url.to_s.empty?
       end
 

data/lib/jpsclient/utils/content_type.rb

@@ -0,0 +1,43 @@
+module JPSClient
+  # 上传文件的 Content-Type 推导
+  #
+  # S3 对象最终的 Content-Type 由两处决定：简单上传是 PUT 时发送的 header，
+  # 分片上传是 CreateMultipartUpload 的 contentType。两条链路统一走这里的映射，
+  # 避免所有对象都存成 application/octet-stream，导致浏览器无法内联预览图片/视频、
+  # Android 无法识别 apk 安装包。
+  module ContentType
+    # 无法识别扩展名时的兜底类型
+    DEFAULT = 'application/octet-stream'.freeze
+
+    # 扩展名 → Content-Type
+    # .ipa / .exe 保持 application/octet-stream：这是安装包分发的惯例值，
+    # 换成其他类型对客户端没有收益
+    EXTENSION_MAP = {
+      '.zip'  => 'application/zip',
+      '.apk'  => 'application/vnd.android.package-archive',
+      '.ipa'  => DEFAULT,
+      '.exe'  => DEFAULT,
+      '.png'  => 'image/png',
+      '.jpg'  => 'image/jpeg',
+      '.jpeg' => 'image/jpeg',
+      '.gif'  => 'image/gif',
+      '.bmp'  => 'image/bmp',
+      '.webp' => 'image/webp',
+      '.mp4'  => 'video/mp4',
+      '.mov'  => 'video/quicktime',
+      '.avi'  => 'video/x-msvideo',
+      '.mkv'  => 'video/x-matroska',
+      '.webm' => 'video/webm'
+    }.freeze
+
+    module_function
+
+    # 根据文件扩展名推导 Content-Type
+    #
+    # @param file_path [String] 文件路径
+    # @return [String] Content-Type，无法识别时返回 DEFAULT
+    def for_file(file_path)
+      EXTENSION_MAP.fetch(::File.extname(file_path.to_s).downcase, DEFAULT)
+    end
+  end
+end

data/lib/jpsclient/version.rb

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

data/lib/jpsclient.rb

@@ -12,6 +12,7 @@ require 'jpsclient/base/client'
 # 工具模块
 require 'jpsclient/utils/logger'
 require 'jpsclient/utils/aes'
+require 'jpsclient/utils/content_type'
 
 # HTTP 模块
 require 'jpsclient/http/http_client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpsclient
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Your Name
@@ -274,6 +274,7 @@ files:
 - lib/jpsclient/upload/upload_media_client.rb
 - lib/jpsclient/upload/upload_progress.rb
 - lib/jpsclient/utils/aes.rb
+- lib/jpsclient/utils/content_type.rb
 - lib/jpsclient/utils/debug.rb
 - lib/jpsclient/utils/logger.rb
 - lib/jpsclient/version.rb
@@ -296,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.11
 specification_version: 4
 summary: JPS Platform API Client with Full API Support
 test_files: []