pindo 5.10.6 → 5.10.9

data/lib/pindo/module/appselect.rb

@@ -63,6 +63,33 @@ module Pindo
           return sub_json
         end
 
+        # Android Bundle Name 相关函数
+        def all_dev_bundle_name
+          bundle_names = []
+          begin
+            config = Pindoconfig.instance.pindo_common_config_json
+            if config && config['android_dev_bundle_array']
+              bundle_names = config['android_dev_bundle_array']
+            end
+          rescue => e
+            raise Informative, "注意: android_dev_bundle_array 配置不存在或无法加载"
+          end
+          return bundle_names
+        end
+
+        def all_deploy_bundle_name
+          bundle_names = []
+          begin
+            config = Pindoconfig.instance.pindo_common_config_json
+            if config && config['android_deploy_bundle_array']
+              bundle_names = config['android_deploy_bundle_array']
+            end
+          rescue => e
+            raise Informative,  "注意: android_deploy_bundle_array 配置不存在或无法加载"
+          end
+          return bundle_names
+        end
+
 
         def all_itc_bundleid
           all_bundleid = []
@@ -190,6 +217,88 @@ module Pindo
           
         end
 
+        def get_selected_dev_bundle_name()
+          # 检查环境变量
+          env_bundle_name = ENV['PINDO_BUNDLE_NAME']
+          if env_bundle_name && !env_bundle_name.empty?
+            puts "\n使用环境变量指定的Bundle Name: #{env_bundle_name}"
+            puts
+            # 保存到缓存
+            require_relative '../base/pindocontext'
+            context = Pindo::PindoContext.instance
+            context.set_selection(Pindo::PindoContext::SelectionKey::ANDROID_BUNDLE_NAME, env_bundle_name)
+            return env_bundle_name
+          end
+
+          # 检查缓存
+          require_relative '../base/pindocontext'
+          context = Pindo::PindoContext.instance
+          cached_bundle_name = context.get_selection(Pindo::PindoContext::SelectionKey::ANDROID_BUNDLE_NAME)
+
+          if cached_bundle_name
+            puts "\n使用之前选择的Bundle Name: #{cached_bundle_name}"
+            puts
+            return cached_bundle_name
+          end
+
+          all_bundle_names = all_dev_bundle_name()
+
+          if all_bundle_names.nil? || all_bundle_names.empty?
+            puts "\n未配置任何开发环境的Android Bundle Name"
+            return nil
+          end
+
+          cli = HighLine.new
+          menu_choice = "None"
+          puts
+          cli.choose do |menu|
+            menu.header = "可用的Android Bundle Name如下:"
+            menu.prompt = "请选择使用的Bundle Name,请输入选项(1/2/3...):"
+            for bundle_name in all_bundle_names do
+              menu.choice(bundle_name) do |details|
+                menu_choice = "#{details}"
+              end
+            end
+          end
+
+          puts
+          puts "选择的Bundle Name是: #{menu_choice}"
+          puts
+
+          # 保存选择到缓存
+          context.set_selection(Pindo::PindoContext::SelectionKey::ANDROID_BUNDLE_NAME, menu_choice)
+
+          return menu_choice
+        end
+
+        def get_selected_deploy_bundle_name()
+          all_bundle_names = all_deploy_bundle_name()
+
+          if all_bundle_names.nil? || all_bundle_names.empty?
+            puts "\n未配置任何发布环境的Android Bundle Name"
+            return nil
+          end
+
+          cli = HighLine.new
+          menu_choice = "None"
+          puts
+          cli.choose do |menu|
+            menu.header = "可用的Android Bundle Name如下:"
+            menu.prompt = "请选择使用的Bundle Name,请输入选项(1/2/3...):"
+            for bundle_name in all_bundle_names do
+              menu.choice(bundle_name) do |details|
+                menu_choice = "#{details}"
+              end
+            end
+          end
+
+          puts
+          puts "选择的Bundle Name是: #{menu_choice}"
+          puts
+
+          return menu_choice
+        end
+
         def get_deploy_setting_repo(tagname:nil)
           sub_setting_json = deploy_build_setting_json()
           return sub_setting_json[tagname]['git_repo_name']

data/lib/pindo/module/appstore/appstore_in_app_purchase.rb

@@ -9,7 +9,7 @@ module Pindo
 
         def get_price_tier_dict
 
-             iap_tier_file = File.join(File.expand_path('./', __dir__), 'iap_tier.json')
+             iap_tier_file = File.join(File.expand_path('./', __dir__), 'appstore_iap_tier.json')
              iap_tier_json = JSON.parse(File.read(iap_tier_file))
 
             return iap_tier_json

data/lib/pindo/module/build/{buildhelper.rb → build_helper.rb}

@@ -1,14 +1,13 @@
 require 'singleton'
 require 'fileutils'
 require 'xcodeproj' # 用于iOS项目检查
-require_relative '../android/base_helper'
+require_relative '../android/android_project_helper'
 require_relative '../../base/githelper'
 require_relative '../../base/pindocontext'
 module Pindo
 
       class BuildHelper
         include Singleton
-        include BaseAndroidHelper
         include Pindo::Githelper
 
         # 临时缓存，只在内存中，不保存到文件

data/lib/pindo/module/build/{commonconfuseproj.rb → confuse_xcodeproj.rb}

@@ -6,8 +6,8 @@ require 'json'
 require 'yaml'
 
 module Pindo
-  module CommonConfuseProj
-    
+  module ConfuseXcodeProj
+
     include Hashhelper
 
     def install_symash(clang_path:nil)

data/lib/pindo/module/cert/cert_helper.rb

@@ -0,0 +1,245 @@
+
+
+require 'match'
+require 'openssl'
+require 'pindo/base/aeshelper'
+require 'pindo/module/cert/keychain_helper'
+require 'pindo/module/cert/provisioning_helper'
+
+
+module Pindo
+
+  class CertHelper
+    # 密码缓存，避免重复获取相同URL的密码
+    @@password_cache = {}
+
+    class << self
+      # 获取密码的辅助方法，使用缓存避免重复获取
+      def get_cached_password(cert_url)
+        unless @@password_cache[cert_url]
+          puts "\e[33m[DEBUG] 密码缓存中未找到，从Keychain获取: #{cert_url}\e[0m" if ENV['PINDO_DEBUG']
+          @@password_cache[cert_url] = AESHelper.fetch_password(keychain_name: cert_url)
+          puts "\e[32m[DEBUG] 密码已缓存: #{cert_url}\e[0m" if ENV['PINDO_DEBUG']
+        else
+          puts "\e[32m[DEBUG] 从密码缓存获取: #{cert_url}\e[0m" if ENV['PINDO_DEBUG']
+        end
+        @@password_cache[cert_url]
+      end
+
+      # 清除密码缓存
+      def clear_password_cache
+        @@password_cache.clear
+      end
+
+      # 清除特定URL的密码缓存
+      def clear_password_cache_for_url(cert_url)
+        @@password_cache.delete(cert_url)
+      end
+
+      def get_cert_info(cer_certificate)
+        # can receive a certificate path or the file data
+        begin
+          if File.exist?(cer_certificate)
+            cer_certificate = File.binread(cer_certificate)
+          end
+        rescue ArgumentError
+          # cert strings have null bytes; suppressing output
+        end
+
+        cert = OpenSSL::X509::Certificate.new(cer_certificate)
+
+        # openssl output:
+        # subject= /UID={User ID}/CN={Certificate Name}/OU={Certificate User}/O={Organisation}/C={Country}
+        cert_info = cert.subject.to_s.gsub(/\s*subject=\s*/, "").tr("/", "\n")
+        out_array = cert_info.split("\n")
+        openssl_keys_to_readable_keys = {
+          'UID' => 'User ID',
+          'CN' => 'Common Name',
+          'OU' => 'Organisation Unit',
+          'O' => 'Organisation',
+          'C' => 'Country',
+          'notBefore' => 'Start Datetime',
+          'notAfter' => 'End Datetime'
+        }
+
+        return out_array.map { |x| x.split(/=+/) if x.include?("=") }
+                          .compact
+                          .map { |k, v| [openssl_keys_to_readable_keys.fetch(k, k), v] }
+                          .push([openssl_keys_to_readable_keys.fetch("notBefore"), cert.not_before])
+                          .push([openssl_keys_to_readable_keys.fetch("notAfter"), cert.not_after])
+      rescue => ex
+        raise Informative, "get_cert_info: #{ex}"
+        return {}
+      end
+
+      def select_cert_or_key(paths:)
+        cert_id_path = ENV['MATCH_CERTIFICATE_ID'] ? paths.find { |path| path.include?(ENV['MATCH_CERTIFICATE_ID']) } : nil
+        cert_id_path || paths.last
+      end
+
+      def is_cert_valid?(cer_certificate_path)
+        cert = OpenSSL::X509::Certificate.new(File.binread(cer_certificate_path))
+        now = Time.now.utc
+        return (now <=> cert.not_after) == -1
+      end
+
+      def isMac?
+        (/darwin/ =~ RUBY_PLATFORM) != nil
+      end
+
+      def install_certs(cert_url:nil, certs_dir:nil, cert_type:nil, platform_type:nil)
+
+        cert_git_dir = cert_type.downcase
+        if platform_type.downcase.eql?("macos")
+          if cert_type.downcase.include?("development")
+            cert_git_dir = "development"
+          elsif cert_type.downcase.eql?("appstore")
+            cert_git_dir = "distribution"
+          else
+            cert_git_dir = "developer_id_application"
+          end
+        else
+          if !cert_type.downcase.include?("development")
+            cert_git_dir = "distribution"
+          end
+        end
+
+        certs = Dir[File.join(certs_dir, "certs", cert_git_dir.to_s, "*.cer")]
+        keys = Dir[File.join(certs_dir, "certs", cert_git_dir.to_s, "*.p12")]
+
+        if certs.count == 0 || keys.count == 0
+          raise Informative, "No certificates found in #{certs_dir}"
+        else
+          output_dir = Dir.mktmpdir
+
+          decrypt_password = CertHelper.get_cached_password(cert_url)
+          Funlog.instance.fancyinfo_start("正在安装证书...")
+
+          cert_path = AESHelper.decrypt_specific_file(src_file: certs.first, password:decrypt_password, output_dir: output_dir)
+          if cert_path.nil? || cert_path.empty? || !File.exist?(cert_path)
+            AESHelper.delete_password(keychain_name:cert_url)
+            # 清除内存中的密码缓存，避免重复使用错误密码
+            @@password_cache.delete(cert_url)
+            raise Informative, "证书解析失败，密码错误！"
+          end
+
+          key_path = AESHelper.decrypt_specific_file(src_file: keys.first, password:decrypt_password, output_dir: output_dir)
+          if key_path.nil? || key_path.empty? || !File.exist?(key_path)
+            AESHelper.delete_password(keychain_name:cert_url)
+            # 清除内存中的密码缓存，避免重复使用错误密码
+            @@password_cache.delete(cert_url)
+            raise Informative, "证书解析失败，密码错误！"
+          end
+
+          unless is_cert_valid?(cert_path)
+            raise Informative, "证书已经过期，请重新生产新证书!"
+          end
+
+
+          if isMac?
+
+            keychain_name = "login.keychain"
+            if FastlaneCore::CertChecker.installed?(cert_path, in_keychain: nil)
+              Funlog.instance.fancyinfo_success("证书#{File.basename(cert_path)}已安装，无需重复安装!")
+            else
+
+              cert_password = Pindoconfig.instance.cert_key_password
+              keychain = 'login.keychain'
+              keychain_path = FastlaneCore::Helper.keychain_path(keychain)
+
+              KeychainHelper.import_file(cert_path, keychain_path, keychain_password: cert_password, certificate_password:'' )
+              KeychainHelper.import_file(key_path, keychain_path, keychain_password: cert_password, certificate_password: '')
+
+              Funlog.instance.fancyinfo_success("证书'#{File.basename(cert_path)}'安装完成！")
+
+            end
+          else
+            Funlog.instance.fancyinfo_error("非Mac电脑不支持安装证书!")
+          end
+
+        end
+      end
+
+      def install_provisionfiles(cert_url:nil, certs_dir:nil, bundle_id_map:nil, cert_type:nil, platform_type:nil)
+
+        cert_sub_dir = cert_type.downcase
+        provision_start_name = "Development"
+        provision_extension_name = ".mobileprovision"
+
+        if platform_type.downcase.include?("macos")
+          provision_extension_name = ".provisionprofile"
+
+          if cert_type.downcase.include?("development")
+            provision_start_name = "Development"
+            cert_sub_dir = cert_type.downcase
+          elsif cert_type.downcase.eql?("appstore")
+            provision_start_name = "AppStore"
+            cert_sub_dir = "appstore"
+          else
+            provision_start_name = "Direct"
+            cert_sub_dir = "developer_id"
+          end
+        else
+          provision_extension_name = ".mobileprovision"
+          if cert_type.downcase.include?("development")
+            provision_start_name = "Development"
+            cert_sub_dir = cert_type.downcase
+          elsif cert_type.downcase.include?("adhoc")
+            provision_start_name = "Adhoc"
+            cert_sub_dir = "adhoc"
+          else
+            provision_start_name = "AppStore"
+            cert_sub_dir = "appstore"
+          end
+        end
+
+        Funlog.instance.fancyinfo_start("正在安装#{provision_start_name}  #{platform_type} Provisioning Profiles...")
+
+        un_exist_files = []
+        provisioning_info_array = []
+
+        # 在循环外获取密码，避免重复添加到Keychain
+        decrypt_password = CertHelper.get_cached_password(cert_url)
+
+        bundle_id_map.each do |type, bundle_id_temp|
+          profile_filename = File.join(certs_dir, "profiles", cert_sub_dir, [provision_start_name.to_s, bundle_id_temp].join('_') + provision_extension_name)
+          unless File.exist?(profile_filename)
+            un_exist_files << profile_filename
+            next
+          end
+          # puts "正在安装 #{bundle_id_temp}..."
+          output_dir = Dir.mktmpdir
+          file_decrypt = AESHelper.decrypt_specific_file(src_file: profile_filename, password:decrypt_password, output_dir: output_dir)
+          destpath = Provisioninghelper.install(file_decrypt)
+          parsed_data = Provisioninghelper.parse(destpath)
+
+          provisioning_info = {}
+          provisioning_info['type'] = type
+          provisioning_info['bundle_id'] = bundle_id_temp
+          provisioning_info['profile_name'] = parsed_data['Name']
+          provisioning_info['profile_path'] = destpath
+
+          cert_info = get_cert_info(parsed_data["DeveloperCertificates"].first.string).to_h
+          provisioning_info['signing_identity'] = cert_info["Common Name"]
+          provisioning_info['team_id'] = parsed_data["TeamIdentifier"].first
+
+          # puts JSON.pretty_generate(provisioning_info)
+          provisioning_info_array << provisioning_info
+        end
+
+        Funlog.instance.fancyinfo_success("#{provision_start_name} #{platform_type} Provisioning Profiles文件安装完成！")
+
+        if un_exist_files.size > 0
+          Funlog.instance.fancyinfo_error("证书 #{provision_start_name}  #{platform_type} Provisioning Profiles文件不存在！")
+          raise Informative, "The following profiles do not exist: #{un_exist_files.join(', ')}"
+        end
+
+        return provisioning_info_array
+      end
+
+
+    end
+
+
+  end
+end

data/lib/pindo/module/cert/keychain_helper.rb

@@ -0,0 +1,152 @@
+
+require 'open3'
+require 'security'
+
+module Pindo
+
+  class KeychainHelper
+    class << self
+
+      def import_file(path, keychain_path, keychain_password: nil, certificate_password: "", skip_set_partition_list: false, output: false)
+        # puts path
+
+        # puts "Could not find file '#{path}'" unless File.exist?(path)
+
+        password_part = " -P #{certificate_password.shellescape}"
+
+        command = "security import #{path.shellescape} -k '#{keychain_path.shellescape}'"
+        command << password_part
+        command << " -T /usr/bin/codesign" # to not be asked for permission when running a tool like `gym` (before Sierra)
+        command << " -T /usr/bin/security"
+        command << " -T /usr/bin/productbuild" # to not be asked for permission when using an installer cert for macOS
+        command << " -T /usr/bin/productsign"  # to not be asked for permission when using an installer cert for macOS
+        command << " 1> /dev/null" unless output
+
+        # puts command
+        # sensitive_command = command.gsub(password_part, " -P ********")
+
+        # UI.command(sensitive_command) if output
+        Open3.popen3(command) do |stdin, stdout, stderr, thrd|
+          # UI.command_output(stdout.read.to_s) if output
+          # puts "123"
+          # Set partition list only if success since it can be a time consuming process if a lot of keys are installed
+          if thrd.value.success? && !skip_set_partition_list
+            # puts "安装成功!"
+            keychain_password ||= resolve_keychain_password(keychain_path)
+            set_partition_list(path, keychain_path, keychain_password: keychain_password, output: output)
+          else
+            # Output verbose if file is already installed since not an error otherwise we will show the whole error
+            err = stderr.read.to_s.strip
+
+            if err.include?("SecKeychainItemImport") && err.include?("The specified item already exists in the keychain")
+              # UI.verbose("'}' is already installed on this machine")
+              # puts "证书key已经存在，安装完成!"
+            else
+              # puts err
+              # raise Informative, err
+            end
+          end
+        end
+      end
+
+      def help_backticks(command, print: true)
+        # UI.command(command) if print
+        result = `#{command}`
+        # UI.command_output(result) if print
+        return result
+      end
+
+      def set_partition_list(path, keychain_path, keychain_password: nil, output: false)
+        # When security supports partition lists, also add the partition IDs
+        # See https://openradar.appspot.com/28524119
+        if help_backticks('security -h | grep set-key-partition-list', print: false).length > 0
+          password_part = " -k #{keychain_password.to_s.shellescape}"
+
+          command = "security set-key-partition-list"
+          command << " -S apple-tool:,apple:,codesign:"
+          command << " -s" # This is a needed in Catalina to prevent "security: SecKeychainItemCopyAccess: A missing value was detected."
+          command << password_part
+          command << " #{keychain_path.shellescape}"
+          command << " 1> /dev/null" # always disable stdout. This can be very verbose, and leak potentially sensitive info
+
+          # Showing loading indicator as this can take some time if a lot of keys installed
+          # Helper.show_loading_indicator("Setting key partition list... (this can take a minute if there are a lot of keys installed)")
+
+          # Strip keychain password from command output
+          # sensitive_command = command.gsub(password_part, " -k ********")
+          # puts command
+          # UI.command(sensitive_command) if output
+          Open3.popen3(command) do |stdin, stdout, stderr, thrd|
+            unless thrd.value.success?
+              err = stderr.read.to_s.strip
+
+              # Inform user when no/wrong password was used as its needed to prevent UI permission popup from Xcode when signing
+              if err.include?("SecKeychainItemSetAccessWithPassword")
+                keychain_name = File.basename(keychain_path, ".*")
+                # puts "password #{keychain_password}"
+                # puts "keychain #{keychain_name}"
+                # puts "security #{server_name(keychain_name)}"
+                Security::InternetPassword.delete(server: server_name(keychain_name))
+
+                # UI.important("")
+                # UI.important("Could not configure imported keychain item (certificate) to prevent UI permission popup when code signing\n" \
+                #          "Check if you supplied the correct `keychain_password` for keychain: `#{keychain_path}`\n" \
+                #          "#{err}")
+                # UI.important("")
+                # UI.important("Please look at the following docs to see how to set a keychain password:")
+                # UI.important(" - https://docs.fastlane.tools/actions/sync_code_signing")
+                # UI.important(" - https://docs.fastlane.tools/actions/get_certificates")
+                # puts "证书密码错误!"
+              else
+                puts err
+              end
+            end
+          end
+
+          # Hiding after Open3 finishes
+          # Helper.hide_loading_indicator
+
+        end
+      end
+
+      # https://github.com/fastlane/fastlane/issues/14196
+      # Keychain password is needed to set the partition list to
+      # prevent Xcode from prompting dialog for keychain password when signing
+      # 1. Uses keychain password from login keychain if found
+      # 2. Prompts user for keychain password and stores it in login keychain for user later
+      def resolve_keychain_password(keychain_path)
+        keychain_name = File.basename(keychain_path, ".*")
+        server = server_name(keychain_name)
+
+        # Attempt to find password in keychain for keychain
+        item = Security::InternetPassword.find(server: server)
+        if item
+          keychain_password = item.password
+          # UI.important("Using keychain password from keychain item #{server} in #{keychain_path}")
+        end
+
+        if keychain_password.nil?
+          # if UI.interactive?
+            # UI.important("Enter the password for #{keychain_path}")
+            # UI.important("This passphrase will be stored in your local keychain with the name #{server} and used in future runs")
+            # UI.important("This prompt can be avoided by specifying the 'keychain_password' option or 'MATCH_KEYCHAIN_PASSWORD' environment variable")
+            keychain_password = FastlaneCore::Helper.ask_password(message: "Password for #{keychain_name} keychain: ", confirm: true, confirmation_message: "Type password for #{keychain_name} keychain again: ")
+            Security::InternetPassword.add(server, "", keychain_password)
+          # else
+            # UI.important("Keychain password for #{keychain_path} was not specified and not found in your keychain. Specify the 'keychain_password' option to prevent the UI permission popup when code signing")
+            # keychain_password = ""
+          # end
+        end
+
+        return keychain_password
+      end
+
+      # server name used for accessing the macOS keychain
+      def server_name(keychain_name)
+        ["pindo", "keychain", keychain_name].join("_")
+      end
+
+      private :server_name
+    end
+  end
+end

data/lib/pindo/module/cert/pem_helper.rb

@@ -0,0 +1,67 @@
+
+module Pindo
+
+  class PemHelper
+    class << self
+
+      def create_certificate(bundle_id:nil, type:"prod", output_path:"")
+
+        if bundle_id.empty? || output_path.empty?
+          UI.user_error!("bundle id is nil or output_path is nil.")
+        end
+
+        puts "Creating a new push certificate for app '#{bundle_id}'. "
+
+        csr, pkey = Spaceship::Portal.certificate.create_certificate_signing_request
+
+        cert = nil
+        begin
+          if type == "dev"
+            cert = Spaceship::Portal.certificate.development_push.create!(csr: csr, bundle_id: bundle_id)
+          else
+            cert = Spaceship::Portal.certificate.production_push.create!(csr: csr, bundle_id: bundle_id)
+          end
+        rescue => ex
+          if ex.to_s.include?("You already have a current")
+            # That's the most common failure probably
+            raise Informative, "You already have 2 active push profiles for this application/environment. You'll need to revoke an old certificate to make room for a new one"
+          else
+            raise ex
+          end
+        end
+
+
+        x509_certificate = cert.download
+        certificate_type = (type == "dev" ? 'development' : 'production')
+
+        base_base = bundle_id.gsub('.', '_')
+        puts base_base
+        filename_base = base_base + '_' + type
+        
+        
+        private_key_path = File.join(output_path, "#{filename_base}.pkey")
+        File.write(private_key_path, pkey.to_pem)
+        puts "key: #{private_key_path}"
+
+
+        p12_cert_path = File.join(output_path, "#{filename_base}.p12")
+        p12 = OpenSSL::PKCS12.create('goodcert1', certificate_type, pkey, x509_certificate)
+        File.write(p12_cert_path, p12.to_der)
+        puts "p12 : #{p12_cert_path}"
+
+
+        x509_cert_path = File.join(output_path, "#{filename_base}.pem")
+        File.write(x509_cert_path, x509_certificate.to_pem + pkey.to_pem)
+        puts "pem : #{x509_cert_path}"
+
+        return x509_cert_path
+      end
+
+      def login(apple_id:nil)
+        puts apple_id
+        Spaceship::Portal.login(apple_id.to_s)
+        Spaceship::Portal.select_team
+      end
+    end
+  end
+end

data/lib/pindo/module/cert/xcodecerthelper.rb

@@ -346,13 +346,13 @@ module Pindo
 
 
             keys = Dir[File.join(certs_dir, "certs", cert_sub_dir, "*.p12")]   
-            decrypt_password = CertHelper.get_cached_password(cert_git_url)
+            decrypt_password = Pindo::CertHelper.get_cached_password(cert_git_url)
             output_dir = Dir.mktmpdir
             key_path = AESHelper.decrypt_specific_file(src_file: keys.first, password:decrypt_password, output_dir: output_dir)
             if key_path.nil? || key_path.empty? || !File.exist?(key_path)
                 AESHelper.delete_password(keychain_name:cert_git_url)
                 # 清除内存中的密码缓存，避免重复使用错误密码
-                CertHelper.clear_password_cache_for_url(cert_git_url)
+                Pindo::CertHelper.clear_password_cache_for_url(cert_git_url)
                 raise Informative, "证书解析失败，密码错误！"
             end
 

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -535,14 +535,34 @@ module Pindo
 
                 # aws_client = AWSS3Client.new
                 aws_client = JPSClient::UploadClient.new(@pgyer_client)
+
+                # 开始上传主文件，记录开始时间
+                file_size_mb = File.size(ipa_file_upload) / (1024.0 * 1024.0)
+                puts "\n开始上传文件 (#{file_size_mb.round(2)} MB)..."
+                upload_start_time = Time.now
+
                 upload_res = aws_client.upload_file(binary_file:ipa_file_upload)
+
+                # 计算上传耗时
+                upload_duration = Time.now - upload_start_time
+                upload_speed = file_size_mb / upload_duration
+                puts "✅ 文件上传完成! 耗时: #{upload_duration.round(2)} 秒, 平均速度: #{upload_speed.round(2)} MB/s"
+
                 attach_key_url = nil
                 attachFileUrls = []
 
                 begin
                     if !addtach_file.nil? && File.exist?(addtach_file)
-                        puts "存在附件, 继续上传附件..."
+                        attach_size_mb = File.size(addtach_file) / (1024.0 * 1024.0)
+                        puts "\n存在附件, 继续上传附件 (#{attach_size_mb.round(2)} MB)..."
+                        attach_start_time = Time.now
+
                         attach_key_url = aws_client.upload_file(binary_file:addtach_file, isAttach:true)
+
+                        # 计算附件上传耗时
+                        attach_duration = Time.now - attach_start_time
+                        attach_speed = attach_size_mb / attach_duration
+                        puts "✅ 附件上传完成! 耗时: #{attach_duration.round(2)} 秒, 平均速度: #{attach_speed.round(2)} MB/s"
                     end
 
                     if !attach_key_url.nil?