jpsclient 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad5bd859a9d9ac069a226f185690a9b913e05d0f069f0110a1037845229be10b
-  data.tar.gz: 889c49e9c9ef77845eef1aaf2b0514d7ad23608493912757ecca98e678ecf136
+  metadata.gz: 981dafda351203d47d3137bf2e81b0e4e25bb188f23f0842b6b979379d671b23
+  data.tar.gz: e779e003a1ba7d260e146feecc07e5484580e38daa12c94a2613ebed0dc2cf8f
 SHA512:
-  metadata.gz: 394b3e8b9052b2eb58681dc890b5c495e134a331d3dc1b3d6c255a76e4d801836b2f179d9989968d62294776872cf7367752264702f8a8fd545871fb3c2b5b2f
-  data.tar.gz: 91458dc40febc7035047212ba3843a1e32618bca862e6d0fe58770436ed7bad4de35ea791314150b42ad7b3c96cf6a4b9e3d07d9123a01bd3e556fc378fe3d46
+  metadata.gz: e18798568d960240dbb7a9d0929f085ecedd5cc1ecaf7abf8ab342dbef25d201a57b39e10d3718e610f6af5698010634a716bacbc0b651bde3e14b1e9e1533be
+  data.tar.gz: e0f48d126f0ac6806f7e4263f1d329c67c3d83193865b4a2040c940c7ca3e6e99bf56d87280dfd4b2c38c71e39c1fb4f00de0c001e15c3facfbbae86fd7df5f8

data/lib/jpsclient/api/android_jks.rb

@@ -9,6 +9,7 @@ module JPSClient
     # - 删除 JKS 证书
     # - 获取 JKS 证书列表
     # - 获取 JKS 证书详情
+    # - 重命名 JKS 证书（异步）
     # - APK 重签名（异步）
     module AndroidJks
 
@@ -19,24 +20,23 @@ module JPSClient
       # @param key_password [String] key 密码，为空则与 store_password 一致
       # @param validity [Integer] 有效期（天），默认 36500
       # @param distinguished_name [Hash] DN 信息，如 {CN: "xxx", O: "xxx"}
-      # @param bundle_id [String] 包名
+      # @param bundle_id [String] 包名（必填）
       # @param google_account [String] Google 开发者账号
       # @param project_id [String] 关联项目 ID
       # @param remark [String] 备注
       # @return [Hash] API 响应（异步任务）
-      def create_android_jks(alias_name:, store_password: nil, key_password: nil, validity: nil,
-                             distinguished_name: nil, bundle_id: nil, google_account: nil,
+      def create_android_jks(alias_name:, bundle_id:, store_password: nil, key_password: nil, validity: nil,
+                             distinguished_name: nil, google_account: nil,
                              project_id: nil, remark: nil)
         config = @request_config && @request_config["android_jks_create"]
         raise JPSClient::ExceptionError, "Missing config for android_jks_create" unless config && config["url"]
         path = config["url"]
 
-        body_params = { aliasName: alias_name }
+        body_params = { aliasName: alias_name, bundleId: bundle_id }
         body_params[:storePassword] = store_password if store_password
         body_params[:keyPassword] = key_password if key_password
         body_params[:validity] = validity if validity
         body_params[:distinguishedName] = distinguished_name if distinguished_name
-        body_params[:bundleId] = bundle_id if bundle_id
         body_params[:googleAccount] = google_account if google_account
         body_params[:projectId] = project_id if project_id
         body_params[:remark] = remark if remark
@@ -139,14 +139,14 @@ module JPSClient
 
       # 获取 Android JKS 证书详情
       #
-      # @param alias_name [String] 证书别名（必填）
-      # @return [Hash] API 响应，data 包含 id、jksFileUrl、storePassword、keyPassword
-      def get_android_jks_detail(alias_name:)
+      # @param bundle_id [String] 包名（必填）
+      # @return [Hash] API 响应，data 包含 id、aliasName、bundleId、jksFileUrl、storePassword、keyPassword
+      def get_android_jks_detail(bundle_id:)
         config = @request_config && @request_config["android_jks_detail"]
         raise JPSClient::ExceptionError, "Missing config for android_jks_detail" unless config && config["url"]
         path = config["url"]
 
-        get_params = { aliasName: alias_name }
+        get_params = { bundleId: bundle_id }
 
         response = @http_client.get(path, params: get_params)
         result = JPSClient::Response.new(response)
@@ -160,6 +160,35 @@ module JPSClient
         return result.to_h
       end
 
+      # 重命名 Android JKS 证书（异步接口）
+      #
+      # @param id [String] JKS 证书 ID（必填）
+      # @param new_alias [String] 新别名（必填）
+      # @param new_store_password [String] 新 storePassword（必填）
+      # @return [Hash] API 响应（异步任务）
+      def rename_android_jks(id:, new_alias:, new_store_password:)
+        config = @request_config && @request_config["android_jks_rename"]
+        raise JPSClient::ExceptionError, "Missing config for android_jks_rename" unless config && config["url"]
+        path = config["url"]
+
+        body_params = {
+          id: id,
+          newAlias: new_alias,
+          newStorePassword: new_store_password
+        }
+
+        response = @http_client.post(path, body: body_params)
+        result = JPSClient::Response.new(response)
+
+        if result.need_login?
+          do_login(force_login: true)
+          response = @http_client.post(path, body: body_params)
+          result = JPSClient::Response.new(response)
+        end
+
+        return result.to_h
+      end
+
       # APK 重签名（异步接口）
       #
       # @param input_s3_key [String] 输入 APK 文件的 S3 Key（必填）

data/lib/jpsclient/upload/upload_client.rb

@@ -3,6 +3,8 @@ require 'typhoeus'
 require 'thread'
 require 'etc'
 require 'digest'
+require 'cgi'
+require 'uri'
 require 'jpsclient/base/exception'
 require 'jpsclient/upload/upload_config'
 require 'jpsclient/upload/upload_progress'
@@ -39,12 +41,13 @@ module JPSClient
           @upload_failed = false
       end
 
-      def upload_file(binary_file:nil, isAttach:false)
+      def upload_file(binary_file:nil, isAttach:false, enable_cloudflare:false)
 
         raise ExceptionError, "上传文件不能为空" if binary_file.nil? || !File.exist?(binary_file)
 
         @upload_binary_file = binary_file
         @file_size = File.size(@upload_binary_file)
+        @enable_cloudflare = enable_cloudflare
 
         # 处理空文件
         if @file_size == 0
@@ -89,6 +92,11 @@ module JPSClient
               upload_config: @upload_config
           )
 
+          # Debug 模式下打印初始化结果
+          if ENV['PINDO_DEBUG'] == '1'
+            puts "[PINDO_DEBUG] init_file_multipart 返回: #{init_result.inspect}"
+          end
+
           if init_result.nil? || !init_result.dig("data", "upload_id")
               raise ExceptionError, "初始化上传失败，请检查网络或服务器状态"
           end
@@ -291,7 +299,21 @@ module JPSClient
               return
           end
 
-          upload_url = sign_result["data"]["url"]
+          original_url = sign_result["data"]["url"]
+          upload_url = original_url
+
+          # 如果启用 Cloudflare 加速，转换 URL
+          if @enable_cloudflare
+            upload_url = convert_to_cloudflare_fetch_url(original_url)
+          end
+
+          # Debug 模式下打印加速前后 URL 对比
+          if ENV['PINDO_DEBUG'] == '1'
+            puts "[PINDO_DEBUG] 分片 ##{part_no} 原始 URL: #{original_url}"
+            if @enable_cloudflare
+              puts "[PINDO_DEBUG] 分片 ##{part_no} 加速 URL: #{upload_url}"
+            end
+          end
 
           # 计算分片数据范围（使用配置的分片大小）
           chunk_size = @upload_config.chunk_size_bytes
@@ -401,7 +423,29 @@ module JPSClient
           end
       end
 
+      # 将 S3 预签名 URL 转换为 Cloudflare fetch 代理 URL
+      # 格式: https://fetch.goosoul.dev/{filename}?url={percent_encoded_original_url}
+      def convert_to_cloudflare_fetch_url(original_url)
+        return original_url if original_url.nil? || original_url.empty?
 
+        begin
+          uri = URI.parse(original_url)
+
+          # 从路径中提取文件名
+          path_parts = uri.path.split('/')
+          filename = path_parts.last || 'file'
+
+          # 对原始完整 URL 进行 percent 编码
+          encoded_url = CGI.escape(original_url)
+
+          # 构建 Cloudflare fetch URL
+          "https://fetch.goosoul.dev/#{filename}?url=#{encoded_url}"
+        rescue => e
+          # 解析失败时返回原始 URL
+          Logger.instance.info("URL 转换失败: #{e.message}，使用原始 URL")
+          original_url
+        end
+      end
 
   end
-end
+end

data/lib/jpsclient/upload/upload_config.rb

@@ -58,7 +58,7 @@ module JPSClient
         attach_url: json_config['attach_url'] || "attach_file/",
         upload_type: json_config['upload_type'] || "s3",
         concurrent_workers: concurrent_workers,
-        chunk_size_mb: json_config['chunk_size_mb'] || 5,
+        chunk_size_mb: json_config['chunk_size_mb'] || 10,
         max_retry_times: json_config['max_retry_times'] || 6,  # 每个分片重试6次
         timeout_seconds: json_config['timeout_seconds'] || 600,  # 单个分片超时10分钟
         media_region: json_config['media_region'] || "ap-east-1",

data/lib/jpsclient/version.rb

@@ -1,3 +1,3 @@
 module JPSClient
-  VERSION = "2.0.6"
-end
+  VERSION = '2.1.0'
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jpsclient
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Your Name
 bindir: bin
 cert_chain: []
-date: 2026-03-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.3
 specification_version: 4
 summary: JPS Platform API Client with Full API Support
 test_files: []