jpsclient 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f63634bc5ba1fbebefa6a5e9a25ab1d9deec1aff9f9af60c0bf198da5632e66
-  data.tar.gz: 0ddf4fe34aaf7cafedf37b2e10a5c559d9066973845859aed72f107e0d5f8edb
+  metadata.gz: 981dafda351203d47d3137bf2e81b0e4e25bb188f23f0842b6b979379d671b23
+  data.tar.gz: e779e003a1ba7d260e146feecc07e5484580e38daa12c94a2613ebed0dc2cf8f
 SHA512:
-  metadata.gz: d5f01fe231fc63335703a762349a746eec57cf412446bc38dd9c2d456514137f5908c21a45f069b291c8a6575bd38de24293da6e30a753e761a40842168e6920
-  data.tar.gz: b21b6c17c5ae707da4b540b75751753fddf70555e3d24ab7d51499424262e2bdc6b4a10c60d45700646b6200436b15e3d93470e59246769ae6ebc15fb10514a5
+  metadata.gz: e18798568d960240dbb7a9d0929f085ecedd5cc1ecaf7abf8ab342dbef25d201a57b39e10d3718e610f6af5698010634a716bacbc0b651bde3e14b1e9e1533be
+  data.tar.gz: e0f48d126f0ac6806f7e4263f1d329c67c3d83193865b4a2040c940c7ca3e6e99bf56d87280dfd4b2c38c71e39c1fb4f00de0c001e15c3facfbbae86fd7df5f8

data/lib/jpsclient/api/android_jks.rb

@@ -0,0 +1,232 @@
+module JPSClient
+  module API
+    # Android JKS 证书相关 API
+    # 处理 /api/android_jks/* 路径的所有接口
+    #
+    # 支持的功能：
+    # - 创建 JKS 证书（异步）
+    # - 更新 JKS 证书信息
+    # - 删除 JKS 证书
+    # - 获取 JKS 证书列表
+    # - 获取 JKS 证书详情
+    # - 重命名 JKS 证书（异步）
+    # - APK 重签名（异步）
+    module AndroidJks
+
+      # 创建 Android JKS 证书（异步接口）
+      #
+      # @param alias_name [String] 证书别名（必填）
+      # @param store_password [String] keystore 密码，为空则自动生成
+      # @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 google_account [String] Google 开发者账号
+      # @param project_id [String] 关联项目 ID
+      # @param remark [String] 备注
+      # @return [Hash] API 响应（异步任务）
+      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, 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[:googleAccount] = google_account if google_account
+        body_params[:projectId] = project_id if project_id
+        body_params[:remark] = remark if remark
+
+        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
+
+      # 更新 Android JKS 证书信息
+      #
+      # @param id [String] JKS ID（必填）
+      # @param bundle_id [String] 包名
+      # @param google_account [String] Google 开发者账号
+      # @param project_id [String] 关联项目 ID
+      # @param remark [String] 备注
+      # @return [Hash] API 响应
+      def update_android_jks(id:, bundle_id: nil, google_account: nil, project_id: nil, remark: nil)
+        config = @request_config && @request_config["android_jks_update"]
+        raise JPSClient::ExceptionError, "Missing config for android_jks_update" unless config && config["url"]
+        path = config["url"]
+
+        body_params = { id: id }
+        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
+
+        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
+
+      # 删除 Android JKS 证书
+      #
+      # @param id [String] JKS ID（必填）
+      # @return [Hash] API 响应
+      def delete_android_jks(id:)
+        config = @request_config && @request_config["android_jks_delete"]
+        raise JPSClient::ExceptionError, "Missing config for android_jks_delete" unless config && config["url"]
+        path = config["url"]
+
+        body_params = { id: id }
+
+        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
+
+      # 获取 Android JKS 证书列表
+      #
+      # @param page_no [Integer] 当前页数（必填）
+      # @param page_size [Integer] 每页记录数（必填）
+      # @param alias_name [String] 证书别名（可选）
+      # @param google_account [String] Google 开发者账号（可选）
+      # @param project_id [String] 关联项目 ID（可选）
+      # @return [Hash] API 响应，data 包含 list 数组和 total 总数
+      def get_android_jks_list(page_no: 1, page_size: 20, alias_name: nil, google_account: nil, project_id: nil)
+        config = @request_config && @request_config["android_jks_list"]
+        raise JPSClient::ExceptionError, "Missing config for android_jks_list" unless config && config["url"]
+        path = config["url"]
+
+        get_params = { pageNo: page_no, pageSize: page_size }
+        get_params[:aliasName] = alias_name if alias_name
+        get_params[:googleAccount] = google_account if google_account
+        get_params[:projectId] = project_id if project_id
+
+        response = @http_client.get(path, params: get_params)
+        result = JPSClient::Response.new(response)
+
+        if result.need_login?
+          do_login(force_login: true)
+          response = @http_client.get(path, params: get_params)
+          result = JPSClient::Response.new(response)
+        end
+
+        return result.to_h
+      end
+
+      # 获取 Android JKS 证书详情
+      #
+      # @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 = { bundleId: bundle_id }
+
+        response = @http_client.get(path, params: get_params)
+        result = JPSClient::Response.new(response)
+
+        if result.need_login?
+          do_login(force_login: true)
+          response = @http_client.get(path, params: get_params)
+          result = JPSClient::Response.new(response)
+        end
+
+        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（必填）
+      # @param output_s3_key [String] 输出 APK 文件的 S3 Key（必填）
+      # @param new_package [String] 新的包名（必填）
+      # @param jks_id [String] JKS 证书 ID（必填）
+      # @param s3_bucket [String] S3 Bucket，默认 pgy-resource-new
+      # @param use_aapt2 [Boolean] 是否使用 aapt2，默认 true
+      # @param skip_verify [Boolean] 是否跳过签名验证，默认 false
+      # @return [Hash] API 响应（异步任务）
+      def rewrite_apk(input_s3_key:, output_s3_key:, new_package:, jks_id:,
+                      s3_bucket: nil, use_aapt2: nil, skip_verify: nil)
+        config = @request_config && @request_config["android_jks_rewrite_apk"]
+        raise JPSClient::ExceptionError, "Missing config for android_jks_rewrite_apk" unless config && config["url"]
+        path = config["url"]
+
+        body_params = {
+          inputS3Key: input_s3_key,
+          outputS3Key: output_s3_key,
+          newPackage: new_package,
+          jksId: jks_id
+        }
+        body_params[:s3Bucket] = s3_bucket if s3_bucket
+        body_params[:useAapt2] = use_aapt2 unless use_aapt2.nil?
+        body_params[:skipVerify] = skip_verify unless skip_verify.nil?
+
+        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
+
+    end
+  end
+end

data/lib/jpsclient/base/client.rb

@@ -9,6 +9,7 @@ require 'jpsclient/auth/token'
 require 'jpsclient/utils/logger'
 
 # 加载 API 模块
+require 'jpsclient/api/android_jks'
 require 'jpsclient/api/app_level'
 require 'jpsclient/api/app_resource'
 # require 'jpsclient/api/app_resource_version' # 已移除 - API不存在
@@ -98,6 +99,7 @@ module JPSClient
 
   class Client
     # 引入各个 API 模块
+    include API::AndroidJks
     include API::AppLevel
     include API::AppResource
     # include API::AppResourceVersion # 已移除 - API不存在

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.4"
-end
+  VERSION = '2.1.0'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpsclient
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Your Name
@@ -161,6 +161,7 @@ files:
 - LICENSE
 - bin/jpsclient
 - lib/jpsclient.rb
+- lib/jpsclient/api/android_jks.rb
 - lib/jpsclient/api/app_level.rb
 - lib/jpsclient/api/app_resource.rb
 - lib/jpsclient/api/apple_account.rb